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

odc.xiaohui

2023-02-21 426d3d33f23bd04e7cafda728cdcc82f11d5baa3

 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;