From 200acf9283ff06e75874df263b1e125a71e76215 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 27 十月 2023 14:57:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
index c32da70..ebf76cb 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
@@ -105,7 +105,17 @@
@Override
public List<Map<String, Object>> queryCouponListOfSearch(CouponListOfSearch ofSearch) {
- return this.baseMapper.queryCouponListOfSearch(ofSearch.getName(),ofSearch.getType(),ofSearch.getDistributionMethod(),ofSearch.getUserPopulation(),ofSearch.getStatus(),ofSearch.getState(),ofSearch.getPage(),ofSearch.getCityCode(),ofSearch.getStoreId(),ofSearch.getObjType());
+ return this.baseMapper.queryCouponListOfSearch(ofSearch.getName(),
+ ofSearch.getType(),
+ ofSearch.getDistributionMethod(),
+ ofSearch.getUserPopulation(),
+ ofSearch.getStatus(),
+ ofSearch.getState(),
+ ofSearch.getPage(),
+ ofSearch.getCityCode(),
+ ofSearch.getStoreId(),
+ ofSearch.getOperatorId(),
+ ofSearch.getObjType());
}
@Override
--
Gitblit v1.7.1