From f5b7a2eb5125b17d470c9b8e0b9bb6ac1654dbae Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:16:02 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/webapp/static/js/agvWrkDetlLog/wrkDetlLog.js | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/static/js/agvWrkDetlLog/wrkDetlLog.js b/src/main/webapp/static/js/agvWrkDetlLog/wrkDetlLog.js
index b1d105d..c1ea1b6 100644
--- a/src/main/webapp/static/js/agvWrkDetlLog/wrkDetlLog.js
+++ b/src/main/webapp/static/js/agvWrkDetlLog/wrkDetlLog.js
@@ -2,10 +2,10 @@
function getCol() {
var cols = [
{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
- ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
+ ,{field: 'modiTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
];
cols.push(
- //{field: 'suppCode', align: 'center',title: '鏂欑鐮�'},
+ //{field: 'suppCode', align: 'center',title: '璐ф灦鐮�'},
{field: 'anfme', align: 'center',title: '鏁伴噺'});
arrRemove(detlCols, 'field', 'zpallet');
cols.push.apply(cols, detlCols);
--
Gitblit v1.9.1