From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1

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

diff --git a/src/main/webapp/static/js/orderDetl/orderDetl.js b/src/main/webapp/static/js/orderDetl/orderDetl.js
index 1a0cb04..b6e3708 100644
--- a/src/main/webapp/static/js/orderDetl/orderDetl.js
+++ b/src/main/webapp/static/js/orderDetl/orderDetl.js
@@ -26,10 +26,10 @@
             ,{field: 'orderId$', align: 'center',title: '璁㈠崟鍐呯爜'}
             ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
             ,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
-            ,{field: 'maktx', 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