From bcb5e464f879458c421069e7d8c72d8c16b4ac7b Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期六, 13 八月 2022 10:32:46 +0800
Subject: [PATCH] Merge branch 'gzynasrs' of http://47.97.1.152:5880/r/zy-asrs into gzynasrs

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

diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index d63ca12..101a705 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -227,7 +227,7 @@
     ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
     ,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true}
     ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
-    ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'}
+    ,{field: 'zpallet', align: 'center',title: 'PACK鐮�'}
 
     ,{field: 'specs', align: 'center',title: '閰嶇疆'}
     ,{field: 'model', align: 'center',title: '浠g爜', hide: false}

--
Gitblit v1.9.1