From aee6386344123c250b3ddfa3efa9a7e3ff8f6cbb Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期二, 16 九月 2025 09:43:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fyxc_shuttle_wcs' into fyxc_shuttle_wcs

---
 src/main/webapp/views/admin/wrkMast/wrkMast.html |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/main/webapp/views/admin/wrkMast/wrkMast.html b/src/main/webapp/views/admin/wrkMast/wrkMast.html
index bbaa936..f8396ce 100644
--- a/src/main/webapp/views/admin/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/admin/wrkMast/wrkMast.html
@@ -55,6 +55,8 @@
 						</el-table-column>
 						<el-table-column property="shuttleNo" label="绌挎杞�">
 						</el-table-column>
+						<el-table-column property="mainWrkNo" label="涓讳换鍔″彿">
+						</el-table-column>
 						<el-table-column property="systemMsg" label="绯荤粺娑堟伅">
 						</el-table-column>
 						<el-table-column label="鎿嶄綔" width="100">

--
Gitblit v1.9.1