Merge branch 'develop' of bdgit.educoder.net:mwxbgi697/softegg into zhanglinhao_branch
# Conflicts:
# model/顺序图/导游方竞价顺序图.png
# src/后端/java/Configurer.java
# src/后端/java/FreeToGoApplication.java
# src/后端/java/Login/LoginController.java
# src/后端/java/Login/LoginService.java
# src/后端/java/Login/LoginServiceImpl.java
# src/后端/java/Login/controller/LoginController.java
# src/后端/java/Login/service/LoginService.java
# src/后端/java/Login/service/LoginServiceImpl.java
# src/后端/java/User/Dao/UsersRepository.java
# src/后端/java/User/bean/Users.java
# src/后端/java/User/controller/UsersController.java
# src/后端/java/User/service/UserServiceImpl.java
# src/后端/java/User/service/UsersService.java
# src/后端/java/UserServiceImpl.java
# src/后端/java/Users.java
# src/后端/java/UsersController.java
# src/后端/java/UsersRepository.java
# src/后端/java/UsersService.java
# src/后端/java/helloController.java
# src/后端/resources/application.properties
# src/后端/resources/application.yml
|
zhanglinhao