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

rk

10 天以前 4898564fb2510dcdbe10d01eaa94886512aebc77

 admin/src/views/business/deviceRole_f.vue

@@ -16,6 +16,7 @@
                <li><el-button type="primary"  v-permissions="['business:hksync:privilege']" @click="synchronousData">同步</el-button></li>
            </ul>
            <el-table
                :height="tableHeightNew"
                v-loading="isWorking.search"
                :data="tableData.list"
                stripe