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

doum

18 小时以前 cb6aca0642ac8dd5de877ade168066d85acb589c

 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