From cf622d6cb6c76f4cbee4be10288c22878d36a043 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 16 十月 2023 10:38:59 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

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

diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop.js b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop.js
index 77cc6f7..f028e86 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop.js
@@ -15,13 +15,14 @@
 TCompetition.initColumn = function () {
     return [
         {field: 'selectItem', radio: true},
+        {title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
         {title: '门店类型', field: 'type', visible: role==1?true:false, align: 'center', valign: 'middle',
             formatter:function (data) {
                 return {1:"平台门店",2:"运营商门店"}[data]
 
             }
         },
-        {title: '所属运营商', field: 'province', visible: role==1?true:false, align: 'center', valign: 'middle'
+        {title: '所属运营商', field: 'yysName', visible: role==1?true:false, align: 'center', valign: 'middle'
         },
         {title: '省', field: 'province', visible: role==1?true:false, align: 'center', valign: 'middle'
         },

--
Gitblit v1.7.1