From 0cb523849fa0461f09353b062b70fb6fcf5e697b Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 21 十一月 2023 14:10:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld

---
 src/main/webapp/views/deviceOperate/crnOperate.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/views/deviceOperate/crnOperate.html b/src/main/webapp/views/deviceOperate/crnOperate.html
index 44887dd..50f23e9 100644
--- a/src/main/webapp/views/deviceOperate/crnOperate.html
+++ b/src/main/webapp/views/deviceOperate/crnOperate.html
@@ -22,7 +22,7 @@
 				</el-table-column>
 				<el-table-column property="statusType" label="妯″紡">
 				</el-table-column>
-				<el-table-column property="wrkStatus" label="浠诲姟鐘舵��">
+				<el-table-column property="wrkStatus$" label="浠诲姟鐘舵��">
 				</el-table-column>
 				<el-table-column property="deviceStatus" label="璁惧鐘舵��">
 				</el-table-column>

--
Gitblit v1.9.1