Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui

zhanghua

2022-11-28 ca150d38b8ecb9c69b0b32ac865e28fcf8c8fc8f

 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>