Merge remote-tracking branch 'origin/master'

jiangping

2024-03-04 a254510ced8108c0cde37eb31a6b3e6469fcb2fb

 admin/src/views/business/deviceRole_f.vue

@@ -13,7 +13,7 @@
        <!-- 表格和分页 -->
        <template v-slot:table-wrap>
            <ul class="toolbar">
                <li><el-button type="primary" @click="synchronousData">同步</el-button></li>
                <li><el-button type="primary"  v-permissions="['business:hksync:privilege']" @click="synchronousData">同步</el-button></li>
            </ul>
            <el-table
                v-loading="isWorking.search"