From 20c86767e4adeea95a131c8f5f8f7d29a67f83f7 Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期二, 26 十二月 2023 17:34:32 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

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

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java
index a82dc30..4f2b120 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java
@@ -1,6 +1,7 @@
 package com.hz.his.feign.service.platform.bi;
 
 import com.hx.resultTool.Result;
+import com.hz.his.dto.report.EmployeeReportDto;
 import com.hz.his.dto.report.ShopReportDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -49,4 +50,10 @@
     @PostMapping("/admin/export/shop/other/list")
     Result otherInAchievement(@RequestBody ShopReportDto shopReportDto);
 
+    /**
+     * 闂ㄥ簵-鍛樺伐-鐢ㄦ埛鎵ц涓氱哗
+     */
+    @PostMapping("/admin/user/deduction/report/shop/emp/list")
+    Result shopEmpUserList(@RequestBody EmployeeReportDto employeeReportDto);
+
 }

--
Gitblit v1.8.0