Merge remote-tracking branch 'origin/xgmasrs' into xgmasrs

admin

2021-08-27 38d7ec7ea772a6f48a0409f2fcbbcde05364ec7b

 src/main/webapp/views/user/user.html

@@ -88,7 +88,7 @@
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>
        <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">删除</button>
<!--        <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">删除</button>-->
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">导出</button>
    </div>
</script>