- 11 May, 2020 12 commits
-
-
Merge branches 'feature/20200511_申请退款接口切换_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
ping.wu committed
-
姜海波 committed
-
Merge remote-tracking branches 'remotes/origin/feature-2020/4/23-1.9.21-ES查询SDK方法升级-海波' and 'remotes/origin/feature-2020/4/23-1.9.21-预约单-海波'
姜海波 committed -
Merge branches 'feature/20200511_申请退款接口切换_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group # Conflicts: # order-application-service/pom.xml
ping.wu committed -
ping.wu committed
-
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
胡超 committed
-
胡超 committed
-
Merge branches 'feature/20200507_配置修改_明警' and 'master' of gitlab.freemud.com:order-group-application/order-group
张明警 committed
-
- 09 May, 2020 2 commits
- 08 May, 2020 1 commit
-
-
shuhu.hou@freemud.cn committed
-
- 07 May, 2020 8 commits
-
-
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
张明警 committed
-
shuhu.hou@freemud.cn committed
-
张明警 committed
-
张明警 committed
-
张明警 committed
-
shuhu.hou@freemud.cn committed
-
- 06 May, 2020 3 commits
-
-
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/pom.xml # order-management/pom.xml # order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java # order-management/src/main/java/cn/freemud/management/service/impl/OrderDeliveryService.java # order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java
shuhu.hou@freemud.cn committed
-
- 29 Apr, 2020 1 commit
-
-
胡超 committed
-
- 27 Apr, 2020 13 commits
-
-
xiaoer.li@freemud.com committed
-
dingkai 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
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/pom.xml
dingkai committed -
shuhu.hou@freemud.cn committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md
shuhu.hou@freemud.cn committed -
姜海波 committed
-
姜海波 committed
-
