From 40f362f8c120a94f35e28dcba6e70b5e42c6d599 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 24 十月 2023 20:32:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
index adc2a64..d205961 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
@@ -236,8 +236,11 @@
ofSearch.setState(state);
ofSearch.setCityCode(cityCode);
ofSearch.setStoreId(storeId);
- return client.getCouponListOfSearch(ofSearch);
+ return client.getCouponListOfSearch1(ofSearch);
}
+
+
+
@RequestMapping(value = "/listRecord")
@ResponseBody
public Object listRecord(Integer id,String name, Integer type, String phone) {
--
Gitblit v1.7.1