- 30 Dec, 2019 2 commits
- 27 Dec, 2019 6 commits
-
-
Merge branches 'develop' and 'feature/20191225_扫脸支付_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
ping.wu committed -
ping.wu committed
-
dingkai 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 # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/ConfirmOrderRequest.java # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md
shuhu.hou@freemud.cn committed -
shuhu.hou@freemud.cn committed
-
- 26 Dec, 2019 13 commits
-
-
# Conflicts: # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md
shuhu.hou@freemud.cn committed -
胡超 committed
-
shuhu.hou@freemud.cn committed
-
胡超 committed
-
ping.wu committed
-
Merge branches 'develop' and 'feature/20191225_扫脸支付_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop # Conflicts: # order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
ping.wu committed -
ping.wu committed
-
shuhu.hou@freemud.cn committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # ordercenter-sdk/pom.xml
胡超 committed -
张明警 committed
-
张明警 committed
-
张明警 committed
-
shuhu.hou@freemud.cn committed
-
- 25 Dec, 2019 19 commits
-
-
Merge branches 'feature/20191216_记录订单操作人_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group # Conflicts: # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/ConfirmOrderRequest.java # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
ping.wu committed -
ping.wu committed
-
张明警 committed
-
ping.wu committed
-
shuhu.hou@freemud.cn committed
-
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/entities/vo/ShoppingCartInfoRequestVo.java
haibo.jiang committed -
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java
haibo.jiang committed -
张明警 committed
-
haibo.jiang committed
-
shuhu.hou@freemud.cn committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
shuhu.hou@freemud.cn committed -
dingkai committed
-
胡超 committed
-
胡超 committed
-
胡超 committed
-
胡超 committed
-
