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

zhanghua

2023-03-18 b8f5f6cdf5c26db929b7cda0188c587eb8d66c1d

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

@@ -264,7 +264,7 @@
}

header {
  background-color: white;
  // background-color: white;
  display: flex;
  .headerContent {
    padding: 10px 0;