From f52dc5114638600e934cc82fe63c4a25f22594cc Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 13 五月 2024 10:56:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 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 48bb0f4..fab86ce 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
@@ -106,6 +106,9 @@
      * @return
      */
     @PostMapping(value = "/project/list/by/type")
-    List<Map<String, Object>> getProjectByTypeId(@RequestBody ProjectDto projectDto);
+    Result getProjectByTypeId(@RequestBody ProjectDto projectDto);
 
+    /**鏌ヨ椤圭洰绉垎鎶垫墸鐜伴噾鐨勬瘮渚�*/
+    @PostMapping(value = "/project/integral/cash/rate")
+    Result getIntegralCashRate(@RequestBody ProjectDto projectDto);
 }
\ No newline at end of file

--
Gitblit v1.8.0