From 3d163ad0cd40cdf9aa46140bbaad4700c1de086c Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期一, 22 五月 2023 15:04:28 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java | 4 +++-
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java | 6 +++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
index b912564..a76c56d 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
@@ -31,6 +31,8 @@
public static String TYPE_COMMON_GIFT = "gift";
/**鍏叡鏍囪瘑绫诲瀷,钀ラ攢浼樻儬鍒�*/
public static String TYPE_COMMON_MARKE = "marketing";
- //涓夊叓濡囧コ鑺傞鍙栦紭鎯犲埜
+ /**鍏叡鏍囪瘑绫诲瀷,涓夊叓濡囧コ鑺傞鍙栦紭鎯犲埜*/
public static final String TYPE_COMMON_QUEEN_DAY = "queen_day";
+ /**鍏叡鏍囪瘑绫诲瀷,crm鍟嗗搧璇︽儏棰嗗彇浼樻儬鍒�*/
+ public static final String TYPE_COMMON_GOODS_DETAILS = "goods_details";
}
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