From c76e8c849181d237cd5825da085b07eb8088a7c9 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 05 七月 2023 17:43:02 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java | 12 ++++++++++++
1 files changed, 12 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 908aac6..9bc2b28 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
@@ -83,4 +83,16 @@
@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);
+
+ /**
+ * 闂ㄥ簵-娴佸け瀹㈡埛-瀵煎嚭
+ */
+ @PostMapping("/admin/export/shop/loss/user/rate/export")
+ Result lossUserRate(@RequestBody ShopReportDto shopReportDto);
+
}
--
Gitblit v1.8.0