# Conflicts:
#	wisenergy-common/src/main/java/cn/wisenergy/common/utils/Result.java
#	wisenergy-service/src/main/java/cn/wisenergy/service/app/UserService.java
#	wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java