From 1a4b636cae41fdd15199beb1ea5df45b31de5b7d Mon Sep 17 00:00:00 2001
From: cmg <527198563@qq.com>
Date: 星期三, 19 六月 2024 14:27:24 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-stander

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

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
index c640347..4e48627 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
@@ -15,7 +15,7 @@
 /**
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
  */
-@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "project")
+@FeignClient(name="phi-platform-user",path = "/p-his-data",contextId = "project")
 public interface SProjectService {
 
     /**
@@ -106,6 +106,14 @@
      * @return
      */
     @PostMapping(value = "/project/list/by/type")
-    Result  getProjectByTypeId(@RequestBody ProjectDto projectDto);
+    Result getProjectByTypeId(@RequestBody ProjectDto projectDto);
+
+    /**鏌ヨ椤圭洰绉垎鎶垫墸鐜伴噾鐨勬瘮渚�*/
+    @PostMapping(value = "/project/integral/cash/rate")
+    Result getIntegralCashRate(@RequestBody ProjectDto projectDto);
+
+    /**鏌ヨ鏄犲皠椤圭洰妯″潡鏍戝瀷涓夌骇*/
+    @PostMapping(value = "/project/item/relation/list")
+    Result projectItemList(@RequestBody ProjectDto projectDto);
 
 }
\ No newline at end of file

--
Gitblit v1.8.0