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

 Conflicts:

	README.md

	pom.xml

	ruoyi-admin/pom.xml

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java

	ruoyi-admin/src/main/resources/application.yml

	ruoyi-common/pom.xml

	ruoyi-framework/pom.xml

	ruoyi-generator/pom.xml

	ruoyi-job/pom.xml

	ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java

	ruoyi-system/pom.xml

	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java

	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java

	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

	ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

	ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml

	ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml

	ruoyi-ui/package.json

	ruoyi-ui/src/directive/index.js

	ruoyi-ui/src/plugins/download.js

	ruoyi-ui/src/views/index.vue

	ruoyi-ui/src/views/monitor/online/index.vue

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

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

	ruoyi-ui/src/views/tool/gen/basicInfoForm.vue

	ruoyi-ui/src/views/tool/gen/genInfoForm.vue

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>