Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0

zhanghua

2023-01-11 4ec959d7c2ef1d8dd3af287814ca8a27650b99f7

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

@@ -267,7 +267,7 @@
  background-color: white;
  display: flex;
  .headerContent {
    padding: 10px;
    padding: 10px 0;
    display: flex;
    justify-content: space-between;
    align-items: center;