- 10 Jan, 2020 10 commits
-
-
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
姜海波 committed -
姜海波 committed
-
姜海波 committed
-
姜海波 committed
-
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/AssortmentSdkService.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
姜海波 committed -
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/AssortmentSdkService.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
姜海波 committed -
姜海波 committed
-
姜海波 committed
-
姜海波 committed
-
姜海波 committed
-
- 09 Jan, 2020 10 commits
-
-
Merge branches 'develop' and 'feature/20200109_微信订阅消息' of http://gitlab.freemud.com/order-group-application/order-group into develop
ping.wu committed -
ping.wu committed
-
shuhu.hou@freemud.cn committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/enums/OrderSourceType.java
shuhu.hou@freemud.cn committed -
ping.wu committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md
shuhu.hou@freemud.cn committed -
ping.wu committed
-
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
ping.wu committed
-
- 08 Jan, 2020 17 commits
-
-
ping.wu committed
-
Merge branches 'develop' and 'feature/20200103_支付宝支付下单_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop # Conflicts: # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java # call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderResponseVo.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
ping.wu committed -
ping.wu committed
-
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java
haibo.jiang committed -
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
dingkai committed
-
dingkai committed
-
# Conflicts: # assortment-shoppingcart-sdk/pom.xml
shuhu.hou@freemud.cn committed -
shuhu.hou@freemud.cn committed
-
haibo.jiang committed
-
haibo.jiang committed
-
ping.wu committed
-
胡超 committed
-
胡超 committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
胡超 committed
-
- 07 Jan, 2020 3 commits
-
-
dingkai committed
-
dingkai committed
-
shuhu.hou@freemud.cn committed
-
