From fa3e00c4d5e91613e3f2a1f2692cb68635d4ad2d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 22 七月 2025 08:31:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/webapp/static/js/report/workIn.js | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/static/js/report/workIn.js b/src/main/webapp/static/js/report/workIn.js
index 367d367..8405381 100644
--- a/src/main/webapp/static/js/report/workIn.js
+++ b/src/main/webapp/static/js/report/workIn.js
@@ -1,10 +1,10 @@
var pageCurr;
function getCol() {
var cols = [
- {field: 'io_time', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
+ {field: 'ioTime$', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
];
- cols.push.apply(cols, detlCols);
+ cols.push.apply(cols, detlCols2);
return cols;
}
--
Gitblit v1.9.1