From d621324bcf6c5a26f058b24e0f4d2930f41840f4 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 05 八月 2024 18:45:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java | 13 +++++++++++++
1 files changed, 13 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 fab86ce..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
@@ -4,6 +4,7 @@
import com.hz.his.dto.PageDto;
import com.hz.his.dto.TimeDto;
import com.hz.his.dto.project.ProjectDto;
+import com.hz.his.vo.project.ProjectFindVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -48,6 +49,13 @@
* @return Result
*/
@PostMapping(value = "/project/page/list")
+ Result getProjectList(@RequestBody ProjectFindVo projectFindVo);
+
+ /**
+ * 鑾峰彇椤圭洰鍒楄〃锛堝洜涓轰唬鐮佺殑闂锛岃繖涓帴鍙ｄ繚瀛樹笅鏉ワ級
+ * @return Result
+ */
+ @PostMapping(value = "/project/page/list2")
Result getProjectList(@RequestBody PageDto pageDto);
/**
@@ -111,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