From 7e5e4b43f4bcd7248325e1e1a5f10c61d64e93d3 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期六, 03 十二月 2022 13:12:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs

---
 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