Merge branches 'develop' and 'feature/20211202_订单业务类型改造_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/enums/OrderStatus.java
#	order-application-service/src/main/java/cn/freemud/enums/OrderType.java
#	order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
#	order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityApplicationClient.java
#	order-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerExtendClient.java
#	order-application-service/src/main/java/cn/freemud/service/universal/UniversalOrderService.java