- 18 Jan, 2020 4 commits
-
-
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
- 17 Jan, 2020 4 commits
-
-
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
ping.wu committed
-
Merge branches 'feature/20200103_支付宝支付下单_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderResponseVo.java
ping.wu committed
-
- 16 Jan, 2020 1 commit
-
-
shuhu.hou@freemud.cn committed
-
- 15 Jan, 2020 3 commits
-
-
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
- 14 Jan, 2020 9 commits
-
-
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
# Conflicts: # assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/request/CheckCartRequest.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/AssortmentSdkService.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuyAndGiftsPromotionService.java
shuhu.hou@freemud.cn committed -
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
- 13 Jan, 2020 17 commits
-
-
ping.wu committed
-
shuhu.hou@freemud.cn committed
-
Merge branches 'feature/20200102_下单返回订单类型_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
shuhu.hou@freemud.cn committed
-
ping.wu committed
-
shuhu.hou@freemud.cn committed
-
胡超 committed
-
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
ping.wu committed
-
shuhu.hou@freemud.cn committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # ordercenter-sdk/pom.xml
shuhu.hou@freemud.cn committed -
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/AssortmentSdkService.java
shuhu.hou@freemud.cn committed -
胡超 committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml
胡超 committed
-
- 11 Jan, 2020 2 commits
