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

doum

3 天以前 01a9bdffee1f04561b3b59406cbb7a76474c55f3

 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