From 07fc18f77a9764bd47857e30d65abc03cc1e439c Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 16:21:56 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp

---
 src/main/webapp/static/js/locMast/locMast.js |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index 98692a4..c31ecf8 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -28,6 +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: 'row1', align: 'center',title: '鎺�', sort:true}
             ,{field: 'bay1', align: 'center',title: '鍒�', sort:true}
             ,{field: 'lev1', align: 'center',title: '灞�', sort:true}

--
Gitblit v1.9.1