From b85e5fc7e1de22ed66a327b814f11544582b5546 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 24 八月 2023 17:57:38 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

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

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java
index cf291b0..0380043 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java
@@ -82,4 +82,16 @@
     @PostMapping("/admin/export/employee/user/member/distribution/proportion")
     Result memberDistributionProportion(@RequestBody UserReleaseDto userReleaseDto);
 
+    /**
+     * 鍜ㄨ甯�-鑰佸甫鏂颁笟缁�
+     */
+    @PostMapping("/admin/export/employee/oldNew/report")
+    Result oldNewReport(@RequestBody EmployeeReportDto employeeReportDto);
+
+    /**
+     * 鍜ㄨ甯�-棰勭害鍛ㄦ湡鎶ヨ〃
+     */
+    @PostMapping("/admin/export/employee/cycle/week/list")
+    Result cycleWeekList(@RequestBody EmployeeReportDto employeeReportDto);
+
 }

--
Gitblit v1.8.0