From d814bde01eb91d1544b718463cd31317726bbf6b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 27 十二月 2023 21:52:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion

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

diff --git a/src/main/webapp/static/js/pack/pack.js b/src/main/webapp/static/js/pack/pack.js
index 4780364..7236aae 100644
--- a/src/main/webapp/static/js/pack/pack.js
+++ b/src/main/webapp/static/js/pack/pack.js
@@ -25,7 +25,7 @@
             // ,{field: 'id', align: 'center',title: 'ID'}
             ,{field: 'barcode',title: '鏉$爜'}
             ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', minWidth: 250, width: 250}
-            ,{field: 'batch', align: 'center',title: '搴忓垪鐮�', hide: true}
+            ,{field: 'batch', align: 'center',title: '鎵瑰彿', hide: true}
             ,{field: 'settle$', align: 'center',title: '鐘舵��', templet: '#settleTpl',  minWidth: 160, width: 160}
             // ,{field: 'status$', align: 'center',title: '鐘舵��'}
             // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}

--
Gitblit v1.9.1