From c253255495465d4406fcaddeb7be40d15fce290a Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 21 三月 2024 13:00:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs

---
 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..f6721a5 100644
--- a/src/main/webapp/static/js/agvLocMast/locMast.js
+++ b/src/main/webapp/static/js/agvLocMast/locMast.js
@@ -55,7 +55,7 @@
             // ,{field: 'barcode', align: 'center',title: ''}
             // ,{field: 'PdcType', align: 'center',title: ''}
             // ,{field: 'ctnNo', align: 'center',title: ''}
-            //,{field: 'locType1$', align: 'center',title: '楂樹綆绫诲瀷'}
+            ,{field: 'locType1$', align: 'center',title: '搴撲綅绫诲瀷'}
             // ,{field: 'locType2$', align: 'center',title: '瀹界獎绫诲瀷'}
             // ,{field: 'locType3$', align: 'center',title: '杞婚噸绫诲瀷'}
 

--
Gitblit v1.9.1