From 2875be234bb2631071c09ab0852f5fb28af0e9ee Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期二, 04 七月 2023 12:15:47 +0800
Subject: [PATCH] Merge branch 'master' into master-test

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

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java
index a7f4043..2f55d29 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java
@@ -77,6 +77,16 @@
     @PostMapping("/admin/export/shop/user/sleep/deduction/list")
     Result userSleepDeductionList(@RequestBody ShopReportDto shopReportDto);
 
+    /**
+     * 闂ㄥ簵-鍖荤敓鎵ц鍗犳瘮鎯呭喌
+     */
+    @PostMapping("/admin/export/shop/user/doctor/deduction/list")
+    Result userDoctorDeductionList(@RequestBody ShopReportDto shopReportDto);
 
+    /**
+     * 闂ㄥ簵-鍖荤敓鎵ц鍗犳瘮鎯呭喌-鏈堢粺璁�
+     */
+    @PostMapping("/admin/export/shop/user/doctor/deduction/list/month")
+    Result userDoctorDeductionMonthList(@RequestBody ShopReportDto shopReportDto);
 
 }

--
Gitblit v1.8.0