From 6a8b55a2183720ff6106f581695298168896cadc Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 11 十月 2023 16:03:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 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