From 85d1dc328bd46089b63b57bd356908cbba26e29c Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 23 十月 2023 16:45:19 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 01e26f5..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,11 +1,11 @@
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;
import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
/**
@@ -47,7 +47,13 @@
* 鍏跺畠涓氱哗淇℃伅
* ShopOtherVo
*/
- @RequestMapping("/admin/export/shop/other/list")
+ @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