From 2726d124e58aa0a43044f0e52b514ac086262e83 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期五, 17 三月 2023 16:34:17 +0800
Subject: [PATCH] Merge branch 'master-prod-new'

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
index 40cde67..03821bd 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
@@ -6,6 +6,8 @@
 import com.hz.his.dto.coupon.CouponDto;
 import com.hz.his.dto.coupon.CouponGoodsDto;
 import com.hz.his.dto.coupon.CouponListDetailDto;
+import com.hz.his.dto.dictionaries.DictionariesDto;
+import com.hz.phis.dt.marketingCoupon.MarketingCouponDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -94,4 +96,10 @@
      */
     @PostMapping(value = "/getCouponNumber")
     Result getCouponNumber(@RequestBody CouponDto couponDto);
+
+    /**
+     * 鏌ヨ鐢ㄦ埛棰嗗彇钀ラ攢浼樻儬鍒告暟鎹�
+     */
+    @PostMapping(value = "/marketing/data")
+    Result marketingData(@RequestBody(required = false) MarketingCouponDto marketingCouponDto);
 }

--
Gitblit v1.8.0