-
Merge branch '20201125-coco-zhw' of gitlab.freemud.com:order-group-application/order-group into qa · 3040a70f
# Conflicts: # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/entities/dto/ecology/SubscribeMessageRequest.java # order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
张洪旺 committed