# Conflicts:
#	bsoft-api/pom.xml
#	bsoft-api/src/main/java/com/bsoft/api/BsoftApiApplication.java
#	bsoft-api/src/main/java/com/bsoft/api/controller/LoginController.java
#	bsoft-api/src/main/java/com/bsoft/api/controller/UserController.java
#	bsoft-api/src/main/java/com/bsoft/api/mapper/SysUserMapper.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SysUser.java
#	bsoft-api/src/main/java/com/bsoft/api/service/Impl/LoginServiceImpl.java
#	bsoft-api/src/main/resources/application-dev.properties
#	bsoft-api/src/main/resources/application.properties
#	bsoft-api/src/main/resources/mapper/SysUserMapper.xml
#	bsoft-api/src/test/resources/generatorConfig.xml