From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1

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

diff --git a/src/main/webapp/static/js/allLocDetl/locDetl.js b/src/main/webapp/static/js/allLocDetl/locDetl.js
index b0cbf25..528176a 100644
--- a/src/main/webapp/static/js/allLocDetl/locDetl.js
+++ b/src/main/webapp/static/js/allLocDetl/locDetl.js
@@ -9,8 +9,8 @@
         ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
         ,{field: 'batch', align: 'center',title: '搴忓垪鐮�', sort:true}
         ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
-        ,{field: 'units', align: 'center',title: '閿�鍞鍗曞彿', hide: true}
-        ,{field: 'units', align: 'center',title: '閿�鍞鍗曡鍙�', hide: true}
+        ,{field: 'threeCode', align: 'center',title: '閿�鍞鍗曞彿', hide: true}
+        ,{field: 'deadTime', align: 'center',title: '閿�鍞鍗曡鍙�', hide: true}
         ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'}
         ,{field: 'specs', align: 'center',title: '瑙勬牸鍨嬪彿', hide: true}
         ,{field: 'model', align: 'center',title: '閫氱敤鍨嬪彿', hide: true}

--
Gitblit v1.9.1