From 1dbdcf2bf037a06f0a498c84520c8d75ca8de1c0 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 01 九月 2023 08:50:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnasrs' into zjfnasrs

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

diff --git a/src/main/webapp/static/js/orderDetl/orderDetl.js b/src/main/webapp/static/js/orderDetl/orderDetl.js
index caef270..db43d3c 100644
--- a/src/main/webapp/static/js/orderDetl/orderDetl.js
+++ b/src/main/webapp/static/js/orderDetl/orderDetl.js
@@ -32,7 +32,7 @@
             ,{field: 'model', align: 'center',title: '鍨嬪彿'}
             ,{field: 'batch', align: 'center',title: '鎵瑰彿'}
             ,{field: 'unit', align: 'center',title: '鍗曚綅'}
-            ,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉$爜'}
+            ,{field: 'barcode', align: 'center',title: 'pack鐮�'}
             ,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'}
             ,{field: 'unitPrice', align: 'center',title: '鍗曚环'}
             ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�'}

--
Gitblit v1.9.1