From 062323dcda647af8adf1bfce3c80e7a2483af204 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 16 十月 2025 09:27:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qlasrs-sxk' into qlasrs-sxk
---
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 ccf3fa2..442c8e2 100644
--- a/src/main/webapp/static/js/report/workIn.js
+++ b/src/main/webapp/static/js/report/workIn.js
@@ -2,8 +2,8 @@
function getCol() {
var cols = [
{field: 'ioTime$', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
- ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
- ,{field: 'model', align: 'center',title: '鍥惧彿'}
+ // ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
+ // ,{field: 'model', align: 'center',title: '鍥惧彿'}
];
cols.push.apply(cols, detlCols);
return cols;
--
Gitblit v1.9.1