# Conflicts:
#	base-manager/db/add.sql
#	base-manager/pom.xml
#	base-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java
#	base-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DemoStartedService.java