From cac5b314ea4f370235f9c40210ce792eb838c7ff Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期一, 04 八月 2025 08:12:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-2' into tzskasrs-2
---
src/main/webapp/static/js/agvLocMast/locMast.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/static/js/agvLocMast/locMast.js b/src/main/webapp/static/js/agvLocMast/locMast.js
index 0de37a1..fc711b0 100644
--- a/src/main/webapp/static/js/agvLocMast/locMast.js
+++ b/src/main/webapp/static/js/agvLocMast/locMast.js
@@ -28,7 +28,7 @@
// ,{field: 'locSts', align: 'center',title: ''}
// ,{field: 'sheetNo', align: 'center',title: ''}
//,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
- ,{field: 'qrCodeValue', align: 'center',title: '浜岀淮鐮佸��', sort:true}
+ ,{field: 'barcode', align: 'center',title: '浜岀淮鐮佸��', sort:true}
,{field: 'row1', align: 'center',title: '鎺�', sort:true}
,{field: 'bay1', align: 'center',title: '鍒�', sort:true}
,{field: 'lev1', align: 'center',title: '灞�', sort:true}
--
Gitblit v1.9.1