- 12 May, 2020 5 commits
-
-
http://gitlab.freemud.com/order-group-application/order-group
# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # ordercenter-sdk/readme.md
姜海波 committed -
姜海波 committed
-
姜海波 committed
-
姜海波 committed
-
姜海波 committed
-
- 11 May, 2020 22 commits
-
-
胡超 committed
-
胡超 committed
-
胡超 committed
-
dingkai committed
-
dingkai committed
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
胡超 committed
-
xiaoer.li@freemud.com committed
-
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 3 commits
- 08 May, 2020 7 commits
-
-
shuhu.hou@freemud.cn committed
-
Merge branches 'develop' and 'feature/20200423_蜜雪新下单接口_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop # Conflicts: # 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/CheckOrder.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
ping.wu committed -
ping.wu committed
-
ping.wu committed
-
Merge branches 'develop' and 'feature/20200508_9.22需求_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop # Conflicts: # assortment-ordercenter-sdk/readme.md # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java # ordercenter-sdk/readme.md
ping.wu committed -
ping.wu committed
-
ping.wu committed
-
- 07 May, 2020 3 commits
-
-
shuhu.hou@freemud.cn committed
-
xiaoer.li@freemud.com committed
-
dingkai committed
-
