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/views/trayCode/trayCode.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/views/trayCode/trayCode.html b/src/main/webapp/views/trayCode/trayCode.html
index e619fa8..7d54c95 100644
--- a/src/main/webapp/views/trayCode/trayCode.html
+++ b/src/main/webapp/views/trayCode/trayCode.html
@@ -86,7 +86,7 @@
 
 <script type="text/html" id="toolbar">
     <div class="layui-btn-container">
-        <button class="layui-btn layui-btn-normal" id="btn-tray" lay-event="btnTray"><i class="layui-icon layui-icon-print" style="font-size: 15px"></i>鐢熸垚鎵樼洏鐮�</button>
+        <button class="layui-btn layui-btn-normal" id="btn-tray" lay-event="btnTray"><i class="layui-icon layui-icon-print" style="font-size: 15px"></i>鐢熸垚pack鐮�</button>
         <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
     </div>
 </script>

--
Gitblit v1.9.1