- 01 Jun, 2020 23 commits
-
-
Merge remote-tracking branches 'remotes/origin/feature/1.9.25__门店超出配送范围问题' and 'remotes/origin/feature/1.9.25_购物车支持限时折扣类型' into develop
xiaoer.li@freemud.com committed -
梁崇福 committed
-
梁崇福 committed
-
chongfu.liang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
Merge branches 'develop' and 'feature/20200522_买券订单创建_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
ping.wu committed -
chongfu.liang committed
-
ping.wu committed
-
chongfu.liang committed
-
chongfu.liang committed
-
ping.wu committed
-
Merge branches 'develop' and 'feature/20200522_买券订单创建_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop # Conflicts: # 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/response/order/QueryOrdersResponse.java
ping.wu committed -
ping.wu committed
-
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
ping.wu committed
-
Merge branches 'develop' and 'feature/20200522_买券订单创建_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
ping.wu committed -
ping.wu committed
-
- 29 May, 2020 5 commits
-
-
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
xiaoer.li@freemud.com committed
-
chongfu.liang committed
-
- 28 May, 2020 10 commits
-
-
ping.wu committed
-
ping.wu committed
-
ping.wu committed
-
ping.wu committed
-
xiaoer.li@freemud.com committed
-
chongfu.liang committed
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
shuhu.hou@freemud.cn committed
-
xiaoer.li@freemud.com committed
-
- 27 May, 2020 2 commits
-
-
xiaoer.li@freemud.com committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java # order-application-service/pom.xml # order-management/pom.xml # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md
xiaoer.li@freemud.com committed
-
