From 971eb04d09d950f7fa0d534560a76dd69d84c69c Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 08 七月 2024 10:39:43 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-stander

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserProjectService.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserProjectService.java
index 0801c5e..93a83aa 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserProjectService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserProjectService.java
@@ -2,6 +2,7 @@
 
 import com.hx.resultTool.Result;
 import com.hz.his.dto.user.project.DirectCannelVo;
+import com.hz.his.dto.user.project.DirectRepealVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -9,7 +10,7 @@
 /**
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
  */
-@FeignClient(name="phi-platform-service",path = "/phip",contextId = "userProject")
+@FeignClient(name="phi-platform-user",path = "/phip",contextId = "userProject")
 public interface SUserProjectService {
 
     /**
@@ -18,6 +19,15 @@
      * @param directCannelVo 灏佽瀵硅薄
      * @return
      */
-    @PostMapping(value = "/user/getUserLabel")
+    @PostMapping(value = "/user/project/direct/cancel")
     Result directCancel(@RequestBody DirectCannelVo directCannelVo);
+
+    /**
+     * 浣滃簾鐩存帴鎿嶄綔鐢ㄦ埛椤圭洰
+     * 鍛樺伐鐩存帴鎿嶄綔
+     * @param directRepealVo 灏佽瀵硅薄
+     * @return
+     */
+    @PostMapping(value = "/user/project/direct/repeal")
+    Result directRepeal(@RequestBody DirectRepealVo directRepealVo);
 }
\ No newline at end of file

--
Gitblit v1.8.0