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/report/viewWorkCountOut.html | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/views/report/viewWorkCountOut.html b/src/main/webapp/views/report/viewWorkCountOut.html
index e6ed38a..44d60f3 100644
--- a/src/main/webapp/views/report/viewWorkCountOut.html
+++ b/src/main/webapp/views/report/viewWorkCountOut.html
@@ -47,7 +47,7 @@
<table class="layui-hide" id="workOut" lay-filter="workOut"></table>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
-<!-- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" >瀵煎嚭</button>-->
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" >瀵煎嚭</button>
</div>
</script>
--
Gitblit v1.9.1