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/mapper/CouponMapper.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java
index 8fd5d3b..c2cb1f9 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java
@@ -2,6 +2,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dsh.activity.entity.Coupon;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
/**
* <p>
@@ -13,4 +16,6 @@
*/
public interface CouponMapper extends BaseMapper<Coupon> {
+ Map<String, Object> queryConponRuleOfJson(@Param("id") Integer id);
+
}
--
Gitblit v1.7.1