- 09 Aug, 2020 16 commits
-
-
Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
ping.wu committed -
ping.wu committed
-
huiyang.chen committed
-
huiyang.chen committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/pom.xml # order-application-service/src/main/resources/application.properties # order-management/pom.xml # ordercenter-sdk/pom.xml
huiyang.chen committed -
huiyang.chen committed
-
huiyang.chen committed
-
huiyang.chen committed
-
shuhu.hou@freemud.cn committed
-
huiyang.chen committed
-
huiyang.chen committed
-
ping.wu committed
-
Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop # Conflicts: # 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 -
ping.wu committed
-
chongfu.liang committed
-
chongfu.liang committed
-
- 08 Aug, 2020 16 commits
-
-
ping.wu committed
-
huiyang.chen committed
-
huiyang.chen committed
-
huiyang.chen committed
-
huiyang.chen committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/OrderApplication.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
huiyang.chen committed -
huiyang.chen committed
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
# Conflicts: # assortment-shoppingcart-sdk/pom.xml # shopping-cart-application-service/pom.xml
xiaoer.li@freemud.com committed -
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
huiyang.chen committed
-
- 07 Aug, 2020 8 commits
-
-
Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
ping.wu committed -
ping.wu committed
-
张洪旺 committed
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
Merge branch '20200806-10000' of gitlab.freemud.com:order-group-application/order-group into develop # Conflicts: # order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java # order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
张洪旺 committed -
徐康 committed
-
