- 27 May, 2020 12 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 -
xiaoer.li@freemud.com committed
-
xiang.ru committed
-
# 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
xiang.ru committed -
xiang.ru committed
-
雷后领 committed
-
雷后领 committed
-
xiaoer.li@freemud.com committed
-
雷后领 committed
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
- 26 May, 2020 28 commits
-
-
haibo.jiang 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
-
ping.wu committed
-
# Conflicts: # assortment-ordercenter-sdk/readme.md
shuhu.hou@freemud.cn committed -
shuhu.hou@freemud.cn committed
-
# Conflicts: # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
haibo.jiang committed -
haibo.jiang committed
-
shuhu.hou@freemud.cn committed
-
# Conflicts: # order-application-service/pom.xml
shuhu.hou@freemud.cn committed -
shuhu.hou@freemud.cn committed
-
雷后领 committed
-
雷后领 committed
-
Merge branches '2020-05-14-order-group-书亦订单和客户数据库落地' and 'master' of gitlab.freemud.com:order-group-application/order-group
雷后领 committed -
雷后领 committed
-
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
haibo.jiang committed
-
胡超 committed
-
胡超 committed
-
shuhu.hou@freemud.cn committed
-
胡超 committed
-
胡超 committed
-
Merge branches 'develop' and 'feature/20200522_买券订单创建_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop # Conflicts: # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
ping.wu committed -
胡超 committed
-