From db33dbd0ff7a4e7bb1bbae7dab3d0c69b9ee8642 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 02 四月 2024 17:14:00 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

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

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRelationProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRelationProjectService.java
index 9fcd708..30a3ff8 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRelationProjectService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRelationProjectService.java
@@ -34,13 +34,19 @@
     Result deductionCpList(@RequestBody ShopReportDto shopReportDto);
 
     /**
-     * 鍐嶇敓閮�-鎵ц涓氱哗鏁版嵁
+     * 鍐嶇敓閮�-鎵ц涓氱哗鏁版嵁 -2.0鐗堟湰
+     */
+    @PostMapping("/admin/project/relation/report/department/zs/list/V2")
+    Result deductionZsListV2(@RequestBody ShopReportDto shopReportDto);
+
+    /**
+     * 鍐嶇敓閮�-鎵ц涓氱哗鏁版嵁 - 2.0搴熷純
      */
     @PostMapping("/admin/project/relation/report/department/zs/list")
     Result deductionZsList(@RequestBody ShopReportDto shopReportDto);
 
     /**
-     * 鍐嶇敓閮�-娓楅�忎笟缁╂暟鎹�
+     * 鍐嶇敓閮�-娓楅�忎笟缁╂暟鎹� - 2.0搴熷純
      */
     @PostMapping("/admin/project/relation/report/department/zs/permeate/list")
     Result deductionZsPermeateList(@RequestBody ShopReportDto shopReportDto);

--
Gitblit v1.8.0