# Conflicts:
#	pom.xml
#	wisenergy-common/wisenergy-common.iml
#	wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UsersMapper.java
#	wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml
#	wisenergy-mapper/wisenergy-mapper.iml
#	wisenergy-model/wisenergy-model.iml
#	wisenergy-parent.iml
#	wisenergy-service/pom.xml
#	wisenergy-service/wisenergy-service.iml
#	wisenergy-web-admin/pom.xml
#	wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SmsController.java
#	wisenergy-web-admin/src/main/java/cn/wisenergy/web/sms/ShareCodeUtil.java
#	wisenergy-web-admin/wisenergy-web-admin.iml