Merge branches 'feature/20211224_订单业务类型改造合并分支_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerExtendClient.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CustomScoreClient.java