From c51ab886ca899243f36cffe6c1a86d19057d44f5 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:18:38 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js b/src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js
index c29516e..104dc9c 100644
--- a/src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js
+++ b/src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js
@@ -21,6 +21,7 @@
cellMinWidth: 50,
cols: [[
{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',event: 'wrkNo', sort: true}
+ ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿', width:160, sort: true}
,{field: 'modiTime$', align: 'center',title: '宸ヤ綔鏃堕棿', width:160, sort: true}
,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��', width:160}
,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�', width:160}
--
Gitblit v1.9.1