From cb7bf61ddec695b25f8fe509815c5e5794180b0f Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 17 七月 2024 17:14:53 +0800
Subject: [PATCH] Merge branch 'master-base' into master-fwq-爆款活动2.0

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

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSPAService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSPAService.java
index e3aa29c..638aa84 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSPAService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSPAService.java
@@ -52,6 +52,12 @@
     Result monthDeductionEmpNew(@RequestBody ShopReportDto shopReportDto);
 
     /**
+     * SPA闂ㄥ簵-鍛樺伐鏈堟墽琛屾槑缁�
+     */
+    @RequestMapping("admin/export/shop/spa/month/deduction/emp/new/list/all")
+    Result monthDeductionEmpList(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
+
+    /**
      * SPA闂ㄥ簵-鍛樺伐鏈堟墽琛屾槑缁嗗鍑�
      */
     @RequestMapping("admin/export/shop/spa/month/deduction/emp/new/report")

--
Gitblit v1.8.0