From 570e48eb85b3958f56ade7e58a1ab9ef5a4957ed Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期三, 05 六月 2024 17:07:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java |    6 ++++++
 1 files changed, 6 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 4f2b120..26a3fcf 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
@@ -56,4 +56,10 @@
     @PostMapping("/admin/user/deduction/report/shop/emp/list")
     Result shopEmpUserList(@RequestBody EmployeeReportDto employeeReportDto);
 
+    /**
+     * 闂ㄥ簵-涓夊ぇ椤圭洰鎵ц鏁版嵁
+     */
+    @PostMapping("/admin/export/shop/relation/project/list/day")
+    Result relationProjectList(@RequestBody ShopReportDto shopReportDto);
+
 }

--
Gitblit v1.8.0