Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-12-15 b3c3afc2b4af331bbd6ac60f16be9fd6563f7ca0

 ruoyi-ui/src/views/system/user/authRole.vue

@@ -9,7 +9,7 @@
          </el-form-item>
        </el-col>
        <el-col :span="8" :offset="2">
          <el-form-item label="登录账号" prop="phonenumber">
          <el-form-item label="登录账号" prop="userName">
            <el-input  v-model="form.userName" disabled />
          </el-form-item>
        </el-col>