From 05ebcccc2c8099c0252501fea0e1797e5a1361d2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 15 七月 2020 10:59:46 +0800
Subject: [PATCH] Merge branches 'master' and 'xtyasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xtyasrs

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

diff --git a/src/main/webapp/static/js/report/workOut.js b/src/main/webapp/static/js/report/workOut.js
index fc2f2d4..7ad1126 100644
--- a/src/main/webapp/static/js/report/workOut.js
+++ b/src/main/webapp/static/js/report/workOut.js
@@ -17,8 +17,8 @@
         toolbar: '#toolbar',
         cellMinWidth: 50,
         cols: [[
-            {type: 'checkbox'}
-            ,{field: 'io_time', align: 'center', title: '鍑哄簱鏃ユ湡'}
+            // {type: 'checkbox'}
+            {field: 'io_time', align: 'center', title: '鍑哄簱鏃ユ湡'}
             ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
             ,{field: 'crn_str_time', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
             ,{field: 'crn_end_time', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}

--
Gitblit v1.9.1