From 1d07f8271751880bdfbf3ea41e696f9ee719888b Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 17 八月 2023 08:48:36 +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/TIntegralController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TIntegralController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TIntegralController.java
index 6d22eac..1268219 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TIntegralController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TIntegralController.java
@@ -60,9 +60,12 @@
public Object list(String name, String phone,Integer type,Integer category,String time) {
Page<UserIntegral> page = new PageFactory<UserIntegral>().defaultPage();
IntegralListQuery integralListQuery = new IntegralListQuery(page.getSize(), page.getCurrent(), name, phone, type, category, time);
- List<UserIntegral> list = client.list(integralListQuery);
- page.setRecords(list);
- return super.packForBT(page);
+ Page<UserIntegral> list = client.list(integralListQuery);
+ return super.packForBT(list);
+ }
+ @RequestMapping("/tIntegral_add")
+ public String tCompetitionAdd(Model model) {
+ return PREFIX + "TIntegral_add.html";
}
--
Gitblit v1.7.1