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/baseSetting/user/components/main/index.vue

@@ -500,7 +500,7 @@
    .funs {
      display: flex;
      .funs-sp {
        // border: 1px solid #17324c;
         border: 1px solid #DCDFE6;
      }
      .funsItem {
        line-height: 28px;