-
Merge branch 'feature/1.9.22-围餐促销-20200509-dingkai' into feature/1.9.26-围餐促销2-20200610-dingkai · cefbd400# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/service/impl/EncircleOrderServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMealServiceImpl.java
dingkai committed