From 6a90f2d1feaf583c211d5f9fe95dff7f7c748ed3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 06 九月 2024 17:42:20 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0

---
 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserCouponRecordMapper.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserCouponRecordMapper.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserCouponRecordMapper.java
index 80b3ba2..2b88d46 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserCouponRecordMapper.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserCouponRecordMapper.java
@@ -54,6 +54,10 @@
             @Param("beginTime") String beginTime,
             @Param("endTime") String endTime,
             @Param("activityId") Integer activityId);
+    Map<String,Object> getDiscountStatic1(
+            @Param("beginTime") String beginTime,
+            @Param("endTime") String endTime,
+            @Param("activityId") Integer activityId);
 
     List<Map<String,Object>> getBlanceList(@Param("page") Page<Map<String, Object>> page,
                                      @Param("beginTime") String beginTime,

--
Gitblit v1.7.1