From 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 20:24:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionAuditController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionAuditController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionAuditController.java
index d4e0df7..73c887c 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionAuditController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionAuditController.java
@@ -89,6 +89,13 @@
for (String s : split) {
strings.add(s);
}
+ // 现金
+ model.addAttribute("m1",list);
+ // 玩湃币
+ model.addAttribute("m2",list);
+ // 课时
+ model.addAttribute("m3",list);
+ model.addAttribute("state",competition.getAuditStatus());
model.addAttribute("list",list);
model.addAttribute("list1",list1);
model.addAttribute("list2",list2);
@@ -136,7 +143,7 @@
ids.add(-1);
}
Page<Competition> page = new PageFactory<Competition>().defaultPage();
- ListQuery listQuery = new ListQuery(page.getSize(),page.getCurrent(),provinceCode,cityCode,eventName,time,state,registerCondition,ids);
+ ListQuery listQuery = new ListQuery(page.getSize(),page.getCurrent(),provinceCode,cityCode,eventName,time,state,registerCondition,ids,0);
Page<Competition> competitions = competitionClient.listAudit(listQuery);
for (Competition competition : competitions.getRecords()) {
for (TStore tStore : list) {
--
Gitblit v1.7.1