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/order/order.js |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index ebd66fd..5f68cdd 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -131,7 +131,7 @@
                         cols: [[
                             {type: 'numbers'},
                             {field: 'matnr', title: '鐗╂枡鍙�', width: 160},
-                            {field: 'maktx', title: '鐗╂枡鍙�', width: 160},
+                            {field: 'maktx', title: '鐗╂枡鍚嶇О', width: 160},
                             {field: 'batch', title: '搴忓垪鐮�'},
                             {field: 'anfme', title: '鏁伴噺'},
                             {field: 'qty', title: '浣滀笟鏁伴噺', style: 'font-weight: bold'},
@@ -238,7 +238,7 @@
                     cols: [[
                         {type: 'numbers', title: '#'},
                         {field: 'matnr', title: '鐗╂枡鍙�', width: 160},
-                        {field: 'maktx', title: '鐗╂枡鍙�', width: 200},
+                        {field: 'maktx', title: '鐗╂枡鍚嶇О', width: 200},
                         {field: 'batch', title: '搴忓垪鐮�', edit: true},
                         {field: 'specs', title: '瑙勬牸'},
                         {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},

--
Gitblit v1.9.1