From fa302a7e0a5960a0f7e9fc763a1f56fbed481c4e Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 20 十一月 2023 18:40:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiCoreProjectService.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiCoreProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiCoreProjectService.java
index 412f13c..51565b4 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiCoreProjectService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiCoreProjectService.java
@@ -38,5 +38,9 @@
     @PostMapping("/admin/export/core/project/data/rate")
     Result dataAll(@RequestBody CoreProjectReportDto coreProjectReportDto);
 
-
+    /**
+     * 鏍规嵁鏍稿績椤圭洰绫诲瀷鏌ヨ鍜ㄨ甯堝畬鎴愭儏鍐�(鎴愪氦閲戦)
+     */
+    @PostMapping("/admin/export/core/project/employee/consume/list")
+    Result employeeConsumeList(@RequestBody CoreProjectReportDto coreProjectReportDto);
 }

--
Gitblit v1.8.0