readme.md
10.2 KB
-
Merge branch 'feature/20201112_fixbug-getCouponNameByCode_yu.sun' into qa · 81da00f8
# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/pom.xml # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
huiyang.chen committed