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

zhanghua

2023-01-29 e40748d026cdd85225b2eb2582299ed54ec862fb

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

@@ -40,7 +40,7 @@
<style lang="scss" scoped>
.userList {
    text-align: left;
    margin: 10px 20px;
    padding: 10px 20px;
    color: #4b9bb7;
  border: 1px solid #ccc;
}