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

zhanghua

2023-02-16 a8532e35b1a39de9bbcc5f2a648fe02c72d9c2b0

 src/views/systemSetting/baseSetting/user/index.vue

@@ -42,9 +42,10 @@
</script>
<style lang="scss" scoped>
.userList {
  //height: 100%;
    text-align: left;
    margin: 10px 20px;
    color: #4b9bb7;
  border: 1px solid #ccc;
    padding: 10px 20px;
    // color: #4b9bb7;
    border: 1px solid #ccc;
}
</style>