From 7aa9607492e2c0b70838c53083f5362e49e74f44 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 26 九月 2023 21:39:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop.js | 2 +-
1 files changed, 1 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..95565b7 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
@@ -21,7 +21,7 @@
}
},
- {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