From 290e5fd2e74efe19326f56e38c3391aaae23ffc5 Mon Sep 17 00:00:00 2001
From: IZCD4L12RTSW0VZ\Administrator <skyouc>
Date: 星期三, 24 十二月 2025 17:14:09 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

---
 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 ec329f9..c774179 100644
--- a/src/main/webapp/static/js/report/workIn.js
+++ b/src/main/webapp/static/js/report/workIn.js
@@ -1,8 +1,8 @@
 var pageCurr;
 function getCol() {
     var cols = [
-        {field: 'ioTime$', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
-        ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
+        {field: 'ioTime', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
+        ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
     ];
     cols.push.apply(cols, detlCols);
     return cols;

--
Gitblit v1.9.1