From c81d766cd91be3b3a24c8db94dcd93c071a66c62 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 14 七月 2023 09:30:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-activity/src/main/java/com/dsh/activity/service/ICouponService.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/ICouponService.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/ICouponService.java
index 970ef48..f9cde35 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/ICouponService.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/ICouponService.java
@@ -5,6 +5,7 @@
 import com.dsh.activity.model.CouponListVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author zhibing.pu
@@ -20,4 +21,9 @@
      * @throws Exception
      */
     List<CouponListVo> queryCouponList(Integer uid, Integer distributionMethod) throws Exception;
+
+
+
+
+    Map<String, Object> queryConponRuleOfJson(Integer id);
 }

--
Gitblit v1.7.1