From 3efe34fdc1dfe58e16c8689faf086b38b2d73e83 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 16 三月 2026 16:41:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxhcwcs-version1.0' into jxhcwcs-version1.0

---
 src/main/webapp/static/js/deviceConfig/deviceConfig.js |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/webapp/static/js/deviceConfig/deviceConfig.js b/src/main/webapp/static/js/deviceConfig/deviceConfig.js
index e514c91..bc11605 100644
--- a/src/main/webapp/static/js/deviceConfig/deviceConfig.js
+++ b/src/main/webapp/static/js/deviceConfig/deviceConfig.js
@@ -27,6 +27,7 @@
             ,{field: 'ip', align: 'center',title: '璁惧ip'}
             ,{field: 'port', align: 'center',title: '璁惧绔彛'}
             ,{field: 'threadImpl', align: 'center',title: '瀹炵幇绫�'}
+            ,{field: 'gatewayId', align: 'center',title: '缃戝叧缂栧彿'}
             ,{field: 'fake$', align: 'center',title: '铏氭嫙璁惧'}
             ,{field: 'fakeInitStatus', align: 'center',title: '铏氭嫙璁惧鍒濆鍖栬澶囩姸鎬�'}
             ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}

--
Gitblit v1.9.1