From 55dc3707715ed7213163f4c8a0bf79c6a6f4dc63 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 21 六月 2023 14:27:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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..908aac6 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,10 @@
@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);
}
--
Gitblit v1.8.0