From b196900d48deefb0129e28df0a842fadc3d6bff1 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 03 九月 2024 12:54:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs

---
 src/main/webapp/static/js/report/workIn.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/static/js/report/workIn.js b/src/main/webapp/static/js/report/workIn.js
index 367d367..ec329f9 100644
--- a/src/main/webapp/static/js/report/workIn.js
+++ b/src/main/webapp/static/js/report/workIn.js
@@ -1,7 +1,7 @@
 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);

--
Gitblit v1.9.1