# Conflicts:
#	gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabSysUserMapper.java
#	gic-data-cloud-service/src/main/java/com/gic/cloud/service/UserService.java
#	gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/UserServiceImpl.java
#	gic-data-cloud-service/src/main/resources/mapper/TabSysUserMapper.xml