- 25 Aug, 2020 11 commits
-
-
Merge branches 'feature/20200820_哗啦啦产品分类名称_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # 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
ping.wu committed -
vega committed
-
vega committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # assortment-shoppingcart-sdk/pom.xml # assortment-shoppingcart-sdk/readme.md # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java # order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md # shopping-cart-application-service/pom.xml
vega committed -
huiyang.chen committed
-
huiyang.chen committed
-
vega committed
-
huiyang.chen committed
-
huiyang.chen committed
-
vega committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
vega committed
-
- 24 Aug, 2020 27 commits
-
-
huiyang.chen committed
-
huiyang.chen committed
-
zhiheng.zhang committed
-
徐康 committed
-
徐康 committed
-
xiaoer.li@freemud.com committed
-
huiyang.chen committed
-
huiyang.chen committed
-
xiaoer.li@freemud.com committed
-
Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
ping.wu committed
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
vega committed -
vega committed
-
vega committed
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
ping.wu committed
-
chongfu.liang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
- 23 Aug, 2020 2 commits
