- 26 May, 2020 5 commits
-
-
shuhu.hou@freemud.cn committed
-
# Conflicts: # order-application-service/pom.xml
shuhu.hou@freemud.cn committed -
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
Merge branches 'develop' and 'feature/20200522_买券订单创建_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop # Conflicts: # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
ping.wu committed
-
- 25 May, 2020 22 commits
-
-
xiaoer.li@freemud.com committed
-
ping.wu committed
-
dingkai committed
-
dingkai committed
-
dingkai committed
-
dingkai committed
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
ping.wu committed
-
dingkai committed
-
dingkai committed
-
# Conflicts: # order-application-service/pom.xml
shuhu.hou@freemud.cn committed -
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
haibo.jiang committed -
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
haibo.jiang committed -
shuhu.hou@freemud.cn committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
haibo.jiang committed -
haibo.jiang committed
-
dingkai committed
-
dingkai committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
dingkai committed
-
- 22 May, 2020 13 commits
-
-
雷后领 committed
-
雷后领 committed
-
雷后领 committed
-
胡超 committed
-
胡超 committed
-
ping.wu committed
-
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
dingkai committed
-
dingkai committed
-
dingkai 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/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java # order-application-service/src/main/java/cn/freemud/service/AppOrderService.java # order-application-service/src/main/java/cn/freemud/service/OrderAdapterService.java # order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # order-management/pom.xml # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java # shopping-cart-application-service/pom.xml
dingkai committed -
# Conflicts: # order-management/pom.xml
shuhu.hou@freemud.cn committed
-
