Merge remote-tracking branch 'origin/master'

luobisheng

2022-11-29 0615f6c8dddf1cff5368e85ce4bfa92c4deebe02

 src/views/systemSetting/device/grid/index.vue

@@ -1,6 +1,5 @@
<template>
    <div class="userList">
        <myHeader @setDialog="changeDialog" @getSearch="getSearch"></myHeader>
        <myMain :refresh="isFresh" :keyword="keyword" @resetFresh="resetFresh" />
    </div>
</template>