Merge branches 'feature/20210728_购物车满赠优惠空判断_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java
#	order-application-service/pom.xml
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
#	pom.xml
#	shopping-cart-application-service/pom.xml