From 05ae715bdf42258e096255cfdd53b90d1e97177f Mon Sep 17 00:00:00 2001
From: Administrator <56479841@QQ.COM>
Date: 星期一, 28 八月 2023 09:00:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6

---
 src/main/webapp/views/order/order.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 4690b27..abb6f7d 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -84,7 +84,7 @@
                             <i class="layui-icon">&#xe654;</i>娣诲姞
                         </button>
                         <button id="importOrder" class="layui-btn icon-btn btn-add">
-                            <i class="layui-icon layui-icon-upload"></i>&nbsp;瀵煎叆閿�鍞崟
+                            <i class="layui-icon layui-icon-upload"></i>&nbsp;瀵煎叆璁㈠崟
                         </button>
                         <input style="display:none" id="importExcel" type="file" onchange="upload(this)" >
                     </div>

--
Gitblit v1.9.1