From 0d30daf9ee89603b97c6181c2949abbb89bd64c4 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期四, 11 四月 2024 13:37:10 +0800
Subject: [PATCH] Merge branch 'tzskasrs-2' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-2

---
 src/main/webapp/static/js/orderDetl/orderDetl.js |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/static/js/orderDetl/orderDetl.js b/src/main/webapp/static/js/orderDetl/orderDetl.js
index c86b5e2..b6e3708 100644
--- a/src/main/webapp/static/js/orderDetl/orderDetl.js
+++ b/src/main/webapp/static/js/orderDetl/orderDetl.js
@@ -25,11 +25,11 @@
             ,{field: 'id', align: 'center',title: 'ID'}
             ,{field: 'orderId$', align: 'center',title: '璁㈠崟鍐呯爜'}
             ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
-            ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
-            ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+            ,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
+            ,{field: 'maktx', align: 'center',title: '鐗╂枡鍚嶇О'}
             ,{field: 'name', align: 'center',title: '鍚嶇О'}
             ,{field: 'specs', align: 'center',title: '瑙勬牸'}
-            ,{field: 'model', align: 'center',title: '鍨嬪彿'}
+            ,{field: 'model', align: 'center',title: '閫氱敤鍨嬪彿'}
             ,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
             ,{field: 'unit', align: 'center',title: '鍗曚綅'}
             ,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉$爜'}

--
Gitblit v1.9.1