From 4b1453e19306592f703aa794e238bd028f67d320 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 一月 2025 16:20:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetitionUser.js | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetitionUser.js b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetitionUser.js
index ff63c31..45ae474 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetitionUser.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetitionUser.js
@@ -31,6 +31,8 @@
},
{title: '身份证号', field: 'idCard', visible: true, align: 'center', valign: 'middle',width:'8%',
},
+ {title: '报名时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle',width:'8%',
+ },
{title: '状态', field: 'state', visible: true, align: 'center', valign: 'middle',width:'8%',
formatter:function (data) {
return {1:"正常",2:"正常",3:"已取消"}[data]
@@ -241,7 +243,7 @@
$(function () {
var defaultColunms = TCompetition.initColumn();
var table = new BSTable(TCompetition.id, "/tCompetition/listUser/"+$("#id").val(), defaultColunms);
- table.setPaginationType("client");
+ table.setPaginationType("server");
TCompetition.table = table.init();
});
--
Gitblit v1.7.1