From f34551ff1b056a39b2581581a3de7931ceb88d2a Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 29 八月 2023 14:29:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java |    2 +-
 1 files changed, 1 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..c640347 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,6 @@
      * @return
      */
     @PostMapping(value = "/project/list/by/type")
-    List<Map<String, Object>> getProjectByTypeId(@RequestBody ProjectDto projectDto);
+    Result  getProjectByTypeId(@RequestBody ProjectDto projectDto);
 
 }
\ No newline at end of file

--
Gitblit v1.8.0