合并代码，解决冲突

zhangchao

2024-11-04 c28e6101a5e42a9cdcc51ef6b69599ea15fe2af9

 src/main/webapp/views/report/viewWorkCountIn.html

@@ -46,7 +46,7 @@
<table class="layui-hide" id="workIn" lay-filter="workIn"></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>

@@ -57,7 +57,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/report/workCountIn.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/report/workCountIn.js?v=3" charset="utf-8"></script>
</body>
</html>