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

doum

10 小时以前 cb6aca0642ac8dd5de877ade168066d85acb589c

 admin/src/views/business/deviceRole.vue

@@ -17,6 +17,7 @@
                <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:devicerole:delete']">删除</el-button></li>
            </ul>
            <el-table
                :height="tableHeightNew"
                v-loading="isWorking.search"
                :data="tableData.list"
                stripe