-
Merge branches 'develop' and 'feature/20200423_蜜雪新下单接口_wuping' of… · 5a7b9e06
Merge branches 'develop' and 'feature/20200423_蜜雪新下单接口_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop # Conflicts: # order-application-service/src/main/java/cn/freemud/service/AppOrderService.java # order-application-service/src/main/java/cn/freemud/service/OrderAdapterService.java # order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
ping.wu committed