- 30 Sep, 2020 6 commits
-
-
huiyang.chen committed
-
huiyang.chen committed
-
huiyang.chen committed
-
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
huiyang.chen committed -
huiyang.chen committed
-
huiyang.chen committed
-
- 29 Sep, 2020 20 commits
-
-
Merge branches 'feature/20200926_麦咖啡特定属性与加料_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
# Conflicts: # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderProductAddInfoDto.java # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
徐康 committed -
徐康 committed
-
huiyang.chen committed
-
ping.wu committed
-
徐康 committed
-
徐康 committed
-
zhiheng.zhang committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
zhiheng.zhang committed -
zhiheng.zhang committed
-
huiyang.chen committed
-
徐康 committed
-
徐康 committed
-
ping.wu committed
-
xiaoer.li committed
-
xiaoer.li committed
-
Merge branches 'feature/20200926_麦咖啡特定属性与加料_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
ping.wu committed
-
xiaoer.li committed
-
xiaoer.li committed
-
- 28 Sep, 2020 14 commits
-
-
xiaoer.li committed
-
xiaoer.li committed
-
xiaoer.li committed
-
ping.wu committed
-
Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
ping.wu committed -
Merge branches 'feature/20200926_麦咖啡特定属性与加料_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
ping.wu committed -
xiaoer.li committed
-
ping.wu committed
-
ping.wu committed
-
ping.wu committed
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
