# Conflicts:
#	xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/AppVersionMarkController.java

# Conflicts:
#	ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/AuthService.java
#	ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/impl/AppAuthServiceImpl.java

# Conflicts:
#	xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml