From a8bfc865c10c1ad75322510c1901edd8a46b12de Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 07 三月 2024 11:11:14 +0800
Subject: [PATCH] 合并代码
---
cloud-server-activity/src/main/java/com/dsh/activity/mapper/UserCouponMapper.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/UserCouponMapper.java b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/UserCouponMapper.java
index 68ed533..e9186fe 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/UserCouponMapper.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/UserCouponMapper.java
@@ -20,6 +20,7 @@
/**
* 获取购买课程可用优惠券列表
+ *
* @param uid
* @param storeId
* @param provinceCode
@@ -27,8 +28,7 @@
* @return
*/
List<Map<String, Object>> queryAvailableCouponList(@Param("uid") Integer uid, @Param("storeId") Integer storeId,
- @Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode);
+ @Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode);
- List<UserCoupon> queryCanuseConponIds(@Param("userId")Integer userId,@Param("couponIds")List<Integer> couponIds);
}
--
Gitblit v1.7.1