From 1e630a0e74dab5ae9e2704de890bbb16b951ec99 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 23 八月 2024 15:46:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java
index 8dd09b3..00efcc8 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java
@@ -64,6 +64,10 @@
public Map<String, Object> getDiscountStatic(String beginTime, String endTime, Integer activityId) {
return this.baseMapper.getDiscountStatic(beginTime,endTime,activityId);
}
+ @Override
+ public Map<String, Object> getDiscountStatic1(String beginTime, String endTime, Integer activityId) {
+ return this.baseMapper.getDiscountStatic1(beginTime,endTime,activityId);
+ }
@Override
public List<Map<String, Object>> getBlanceList(Page<Map<String, Object>> page, String beginTime, String endTime, Integer activityId) {
--
Gitblit v1.7.1