From 2b3d40e046f4fb5b0e746c6ead7af8e66e619952 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 22 三月 2024 10:39:05 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserLabelService.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserLabelService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserLabelService.java
index 85b3eb4..2b34188 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserLabelService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserLabelService.java
@@ -1,13 +1,7 @@
 package com.hz.his.feign.service.platform;
 
 import com.hx.resultTool.Result;
-import com.hz.his.dto.marketing.common.MarketingTotalDto;
-import com.hz.his.dto.user.*;
-import com.hz.his.dto.user.coupon.UserCouponDto;
-import com.hz.his.dto.user.project.UserProjectDto;
-import com.hz.his.dto.user.room.UserDoctorRoomDto;
 import com.hz.his.vo.label.UserLabelVo;
-import net.sf.json.JSONObject;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -18,10 +12,16 @@
 @FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-user-label")
 public interface SPhipUserLabelService {
 
-    /**
-     * 寮�鏀惧钩鍙�-鑾峰彇鐢ㄦ埛鏍囩鍒楄〃
+    /**鑷姩鎵撴爣绛炬帴鍙�
+     * 鐢ㄦ埛鏍囩鏂板锛屽彧鏂板-鏂扮増
      */
-    @PostMapping(value = "/label/user/v2/add")
-    Result add(@RequestBody UserLabelVo userLabelVo);
+    @PostMapping(value = "/label/user/v2/auto-add")
+    Result autoAdd(@RequestBody UserLabelVo userLabelVo);
+
+    /**鐢ㄦ埛鏍囩鍙樻洿-鎵嬪姩鎵撴爣绛炬帴鍙�
+     * 褰撳墠鏍囩鍒嗙被涓嬮潰鐨勬墍鏈夊垎绫昏繘琛屽彉鏇达紝鍖呭惈鏂板鍜屽垹闄�-鏂扮増
+     */
+    @PostMapping(value = "/label/user/v2/update")
+    Result update(@RequestBody UserLabelVo userLabelVo);
 
 }
\ No newline at end of file

--
Gitblit v1.8.0