- 29 Apr, 2020 5 commits
-
-
胡超 committed
-
胡超 committed
-
Merge remote-tracking branch 'remotes/origin/feature_20200426_1.9.21_refundDeliveryFee' into develop # Conflicts: # assortment-ordercenter-sdk/readme.md # ordercenter-sdk/readme.md
胡超 committed -
胡超 committed
-
# Conflicts: # order-application-service/pom.xml # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
dingkai committed
-
- 28 Apr, 2020 7 commits
-
-
ping.wu committed
-
Merge branches 'develop' and 'feature/20200421_申请退款任务_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop # Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # order-application-service/pom.xml # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md
ping.wu committed -
ping.wu committed
-
Merge branches 'develop' and 'feature/20200421_申请退款任务_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
ping.wu committed -
ping.wu committed
-
Merge branches 'develop' and 'feature/20200421_申请退款任务_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
ping.wu committed -
ping.wu committed
-
- 27 Apr, 2020 28 commits
-
-
xiaoer.li@freemud.com committed
-
dingkai committed
-
Merge branches 'develop' and 'feature/20200424_订单详情订单状态错误修改_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
ping.wu committed -
Merge branches 'feature/20200424_订单详情订单状态错误修改_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
ping.wu committed
-
ping.wu committed
-
Merge branches 'feature/20200424_订单详情订单状态错误修改_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
Merge branches 'develop' and 'feature/20200421_申请退款任务_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop # Conflicts: # ordercenter-sdk/readme.md
ping.wu committed -
ping.wu committed
-
ping.wu committed
-
Merge branches 'develop' and 'feature/20200421_申请退款任务_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop # Conflicts: # assortment-ordercenter-sdk/readme.md
ping.wu committed -
ping.wu committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # order-application-service/pom.xml # order-management/pom.xml # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md
dingkai committed -
dingkai committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/pom.xml
dingkai committed -
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md
shuhu.hou@freemud.cn committed -
姜海波 committed
-
姜海波 committed
-
姜海波 committed
-
姜海波 committed
-
shuhu.hou@freemud.cn committed
-
姜海波 committed
-
shuhu.hou@freemud.cn committed
-