From 614b0106f079e67bb674a37ede2bd0fe3df2a430 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 27 七月 2023 17:45:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 6 ++----
1 files changed, 2 insertions(+), 4 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 8c343e3..202b658 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
@@ -47,7 +47,7 @@
*/
@RequestMapping("/coupon_add")
public String memberCouponAdd() {
- return PREFIX + "coupon_add.html";
+ return PREFIX + "TCouponAdd.html";
}
/**
@@ -65,9 +65,7 @@
ofSearch.setUserPopulation(userPopulation);
ofSearch.setStatus(status);
ofSearch.setState(state);
- List<Map<String, Object>> mapList = client.getCouponListOfSearch(ofSearch);
- page.setRecords(mapList);
- return page.getRecords();
+ return client.getCouponListOfSearch(ofSearch);
}
--
Gitblit v1.7.1