From 29bd4d946349eacd38442c07ebf15b470af92e82 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 10 十月 2023 14:26:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/webapp/static/modular/system/gameData/gameData.js |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/static/modular/system/gameData/gameData.js b/cloud-server-management/src/main/webapp/static/modular/system/gameData/gameData.js
index b743ec8..53a0e2a 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/gameData/gameData.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/gameData/gameData.js
@@ -47,7 +47,7 @@
         {field: 'selectItem', checkbox: true},
         {title: '主键ID', field: 'id', visible: false, align: 'center', valign: 'middle'},
         {title: '序号', field: 'account_id', visible:true, align: 'center', valign: 'middle'},
-        {title: '昵称', field: 'nickname', visible: true, align: 'center', valign: 'middle',},
+        {title: '昵称', field: 'name', visible: true, align: 'center', valign: 'middle',},
         {title: '成绩', field: 'score', visible: true, align: 'center', valign: 'middle'},
     ];
 };
@@ -73,7 +73,7 @@
     queryData['date'] = $("#con4").val();
     queryData['cityCode'] = $("#cCode4").val();
     queryData['spaceId'] = $("#site4").val();
-    TSite.table.refresh({query: queryData});
+    TSite1.table.refresh({query: queryData});
 };
 
 TSite.resetSearch = function () {
@@ -95,7 +95,7 @@
     TSite.table = table.init();
 
     var defaultColunms1 = TSite1.initColumn();
-    var table1 = new BSTable(TSite1.id, "/gameData/listAll", defaultColunms1);
+    var table1 = new BSTable(TSite1.id, "/gameData/listAll1", defaultColunms1);
     table1.setPaginationType("client");
     TSite1.table = table1.init();
 });

--
Gitblit v1.7.1