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

whycq

2022-03-09 d8a08e3ef40f5f0381188298b2561fcf0219f977

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

 src/main/webapp/views/itemBusiness/itemBusiness.html

@@ -34,7 +34,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>

 src/main/webapp/views/itemManager/itemManager.html

@@ -34,7 +34,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>