- 08 Jun, 2020 2 commits
-
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/service/impl/EncircleOrderServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMealServiceImpl.java
dingkai committed -
dingkai committed
-
- 05 Jun, 2020 22 commits
-
-
Merge branches 'develop' and 'feature/20200604_统计分类编号维护_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
ping.wu committed -
ping.wu committed
-
dingkai committed
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
ping.wu committed
-
Merge branches 'develop' and 'feature/20200604_预约单任务删除_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 # order-management/pom.xml # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md
ping.wu committed -
ping.wu committed
-
dingkai committed
-
sadseven committed
-
# Conflicts: # ordercenter-sdk/readme.md
sadseven committed -
sadseven committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # ordercenter-sdk/readme.md
sadseven committed -
sadseven committed
-
haibo.jiang committed
-
haibo.jiang committed
-
haibo.jiang committed
-
haibo.jiang committed
-
haibo.jiang committed
-
haibo.jiang committed
-
- 04 Jun, 2020 2 commits
-
-
Merge branches 'develop' and 'feature/20200604_统计分类编号维护_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/request/order/OrderProductAddInfoDto.java
ping.wu committed -
ping.wu committed
-
- 03 Jun, 2020 6 commits
-
-
dingkai committed
-
dingkai committed
-
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 # call-back-service/pom.xml # order-application-service/pom.xml # order-management/pom.xml # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md
dingkai committed -
shuhu.hou@freemud.cn committed
-
dingkai committed
-
- 02 Jun, 2020 8 commits
-
-
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn 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
-
dingkai committed
-
dingkai committed
-
dingkai committed
-
shuhu.hou@freemud.cn committed
-
