Merge branch 'master' of https://gitee.com/xiao12feng/xinli
# Conflicts: # ry-xinli-admin/src/main/java/com/ddnai/web/controller/psychology/PsyAssessmentController.java # ry-xinli-admin/src/main/java/com/ddnai/web/controller/psychology/PsyUserProfileController.java # ry-xinli-admin/src/main/java/com/ddnai/web/controller/system/SysLoginController.java # ry-xinli-system/src/main/java/com/ddnai/system/domain/psychology/PsyUserProfile.java # ry-xinli-system/src/main/java/com/ddnai/system/service/impl/psychology/PsyUserProfileServiceImpl.java # ry-xinli-system/src/main/resources/mapper/system/psychology/PsyUserProfileMapper.xml # sql/ry_news.sql # xinli-ui/src/api/login.js # xinli-ui/src/api/psychology/profile.js # xinli-ui/src/permission.js # xinli-ui/src/store/modules/user.js # xinli-ui/src/views/index.vue # xinli-ui/src/views/login.vue # xinli-ui/src/views/psychology/profile/index.vue # xinli-ui/src/views/system/user/index.vue # 项目介绍/README.md # 项目介绍/安全配置修改说明.md
This commit is contained in:
xiao12feng
commit
e253a39360