- 11 Jun, 2020 1 commit
-
-
xiaoer.li@freemud.com committed
-
- 05 Jun, 2020 14 commits
-
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
sadseven committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md
sadseven committed -
sadseven committed
-
sadseven committed
-
haibo.jiang committed
-
haibo.jiang committed
-
haibo.jiang committed
-
haibo.jiang committed
-
- 04 Jun, 2020 1 commit
-
-
shuhu.hou@freemud.cn committed
-
- 03 Jun, 2020 7 commits
-
-
# 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/response/order/QueryOrdersResponse.java # order-application-service/pom.xml # order-management/pom.xml
dingkai 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/response/order/QueryOrdersResponse.java
雷后领 committed -
dingkai committed
-
Merge branches 'feature/20200515_自提-外卖预约单提醒时间区分_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # call-back-service/pom.xml # ordercenter-sdk/readme.md # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java
ping.wu committed -
# Conflicts: # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
haibo.jiang committed -
Merge remote-tracking branches 'remotes/origin/feature/1.9.25__门店超出配送范围问题', 'remotes/origin/feature/1.9.25_满减提示语', 'remotes/origin/feature/1.9.25_购物车支持限时折扣类型' and 'remotes/origin/feature/19.24_买一赠一活动优化' into qa
xiaoer.li@freemud.com committed -
dingkai committed
-
- 02 Jun, 2020 14 commits
-
-
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
chongfu.liang committed
-
ping.wu committed
-
chongfu.liang committed
-
ping.wu committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # assortment-shoppingcart-sdk/pom.xml # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java # order-management/pom.xml # order-management/src/main/java/cn/freemud/management/service/handle/SaasOrderHandle.java # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md
chongfu.liang committed -
Merge branches 'feature/20200522_买券订单创建_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md
ping.wu committed -
ping.wu committed
-
dingkai committed
-
dingkai committed
-
dingkai committed
-
shuhu.hou@freemud.cn committed
-
# Conflicts: # order-application-service/pom.xml
shuhu.hou@freemud.cn committed
-
- 01 Jun, 2020 3 commits
-
-
xiang.ru 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/response/order/QueryOrdersResponse.java
xiang.ru committed -
梁崇福 committed
-
