From d8afbdc39cd6e7739054fc1cc21898e0b81216d0 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 21 八月 2023 11:38:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-fwq优惠券分类优化' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 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 a5677db..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
@@ -84,9 +84,14 @@
 
     /**
      * 鍜ㄨ甯�-鑰佸甫鏂颁笟缁�
-     * 杩斿洖鎺ュ彛Result.success(data); data鏄釜map,key涓哄憳宸ユ爣璇�,value鏄噾棰�
      */
     @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