# Conflicts:
#	auth-service/src/main/java/com/hungraim/ltr/service/UserDetailsServiceImpl.java
#	common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/governance/ChSrvBuildBed.java
#	common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/governance/ChSrvRemoveBed.java
#	common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/system/SystemResource.java
#	common/common-core/src/main/java/com/hungraim/ltr/pojo/entity/system/SystemRole.java
#	common/common-mybatis/pom.xml
#	pom.xml
#	system/system-admin-service/src/main/java/com/hungraim/ltr/system/dao/SystemResourceMapper.java
#	system/system-admin-service/src/main/java/com/hungraim/ltr/system/dao/SystemRoleResourceMapper.java