-
Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of… · 2da98399Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # Conflicts: # assortment-shoppingcart-sdk/pom.xml # shopping-cart-application-service/pom.xml # shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java # shopping-cart-application-service/src/main/java/cn/freemud/enums/GoodsTypeEnum.java
ping.wu committed
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| main | Loading commit data... | |
| test/java/cn.freemud | Loading commit data... |