From c28e6101a5e42a9cdcc51ef6b69599ea15fe2af9 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期一, 04 十一月 2024 14:31:31 +0800
Subject: [PATCH] 合并代码，解决冲突

---
 src/main/webapp/views/handWrkMast/handWrkMast.html |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/views/handWrkMast/handWrkMast.html b/src/main/webapp/views/handWrkMast/handWrkMast.html
index 9bdd5b4..2283ce8 100644
--- a/src/main/webapp/views/handWrkMast/handWrkMast.html
+++ b/src/main/webapp/views/handWrkMast/handWrkMast.html
@@ -104,8 +104,8 @@
 </div>
 <script type="text/html" id="toolbar">
     <div class="layui-btn-container">
-        <button class="layui-btn layui-btn-normal" id="btn-pri-add" lay-event="priAdd"><i class="layui-icon">&#xe624;</i>澧炲姞浼樺厛绾�</button>
-        <button class="layui-btn layui-btn-normal" id="btn-pri-red" lay-event="priRed"><i class="layui-icon">&#xe67e;</i>闄嶄綆浼樺厛绾�</button>
+<!--        <button class="layui-btn layui-btn-normal" id="btn-pri-add" lay-event="priAdd"><i class="layui-icon">&#xe624;</i>澧炲姞浼樺厛绾�</button>-->
+<!--        <button class="layui-btn layui-btn-normal" id="btn-pri-red" lay-event="priRed"><i class="layui-icon">&#xe67e;</i>闄嶄綆浼樺厛绾�</button>-->
         <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
     </div>
 </script>
@@ -127,7 +127,7 @@
 <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
 <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
 <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/handWrkMast/handWrkMast.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/handWrkMast/handWrkMast.js?v=1" charset="utf-8"></script>
 
 <iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
 

--
Gitblit v1.9.1