1
# Conflicts:
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md

fix