From d8bfa0bc04c65929f9f370f2ad1d0b8ff445805d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 04 七月 2023 08:59:44 +0800
Subject: [PATCH] 合并代码处理冲突
---
cloud-server-activity/src/main/java/com/dsh/activity/service/CouponService.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/CouponService.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/CouponService.java
index c6ee52f..cb92505 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/CouponService.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/CouponService.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.dsh.activity.entity.Coupon;
+import java.util.Map;
+
/**
* <p>
* 优惠券 服务类
@@ -13,4 +15,6 @@
*/
public interface CouponService extends IService<Coupon> {
+ Map<String, Object> queryConponRuleOfJson(Integer id);
+
}
--
Gitblit v1.7.1