From 5fb393a728e569f834059cb1cedbaf128d878b9a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 13 七月 2020 17:16:57 +0800
Subject: [PATCH] Merge branches 'gdasrs' and 'master' of https://gitee.com/luxiaotao1123/zy-asrs into gdasrs
---
src/main/webapp/static/js/waitPakinLog/waitPakinLog.js | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
index 4c5a625..0dd26b7 100644
--- a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
+++ b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
@@ -18,10 +18,10 @@
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox'}
+ // {type: 'checkbox'}
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
// ,{field: 'id', align: 'center',title: '缂栧彿'}
- ,{field: 'pakinId', align: 'center',title: '鍏ュ簱閫氱煡鍙�'}
+ {field: 'pakinId', align: 'center',title: '鍏ュ簱閫氱煡鍙�'}
,{field: 'barcode', align: 'center',title: '鎵樼洏鐮�'}
,{field: 'matnr', align: 'center',title: '鐗╂枡缂栫爜'}
,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
--
Gitblit v1.9.1