From d55581ed00fd0a8ecce78a6ebe6f9e2ee86274b3 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 04 八月 2023 17:01:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs

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

diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index dda89c0..67f93de 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -4,7 +4,7 @@
     var cols = [
         {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'},
         {field: 'matnr', align: 'center',title: '鐗╂枡鍙�', sort:true}
-        ,{field: 'maktx', align: 'center',title: '鐗╂枡鍙�', sort:true}
+        ,{field: 'maktx', align: 'center',title: '鐗╂枡鍚嶇О', sort:true}
         ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
         ,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300, sort:true}
         ,{field: 'anfme', align: 'center',title: '鏁伴噺'}

--
Gitblit v1.9.1