From 6a3f8907a2f9d240f8a07e7283682286d2b52c75 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 08 七月 2024 16:40:31 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 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 2e33340..963981e 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
@@ -52,6 +52,13 @@
     Result getProjectList(@RequestBody ProjectFindVo projectFindVo);
 
     /**
+     * 鑾峰彇椤圭洰鍒楄〃锛堝洜涓轰唬鐮佺殑闂锛岃繖涓帴鍙d繚瀛樹笅鏉ワ級
+     * @return Result
+     */
+    @PostMapping(value = "/project/page/list2")
+    Result getProjectList(@RequestBody PageDto pageDto);
+
+    /**
      * 鑾峰彇椤圭洰闂ㄥ簵浠锋牸鍒楄〃
      * @return Result
      */
@@ -112,4 +119,9 @@
     /**鏌ヨ椤圭洰绉垎鎶垫墸鐜伴噾鐨勬瘮渚�*/
     @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