-
Merge remote-tracking branch 'origin/feature/20201015_麦咖啡允许重复申请退款_xukang' into develop · fb99dcec# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/pom.xml # order-management/pom.xml # order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java # order-management/src/main/java/cn/freemud/management/service/impl/McCafeMangerServiceImpl.java
徐康 committed