From 21569e095e2c707e87634d6b94526a6609f902a9 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期一, 17 二月 2025 13:42:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shuttle_rcs' into shuttle_rcs

---
 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 169f899..bbaa936 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="systemMsg" label="绯荤粺娑堟伅">
+						</el-table-column>
 						<el-table-column label="鎿嶄綔" width="100">
 							<template slot-scope="scope">
 								<el-dropdown @command="(command)=>{handleCommand(command, scope.row)}">

--
Gitblit v1.9.1