From 0ff6f9c85c9b89f6328956cc5764b16f789fc94f Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 22 二月 2024 19:16:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

---
 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