- 19 Nov, 2020 3 commits
-
-
zhiheng.zhang committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/pom.xml # order-management/pom.xml
zhiheng.zhang committed -
zhiheng.zhang committed
-
- 18 Nov, 2020 16 commits
-
-
zhiheng.zhang committed
-
zhiheng.zhang 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
-
xiaoer.li@freemud.com committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
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
-
# 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/request/order/BaseCreateOrderRequest.java # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
xiaoer.li@freemud.com committed -
xiaoer.li@freemud.com committed
-
zhiheng.zhang committed
-
- 17 Nov, 2020 4 commits
-
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
- 16 Nov, 2020 17 commits
-
-
zhiheng.zhang committed
-
xiaoer.li@freemud.com committed
-
zhiheng.zhang committed
-
徐康 committed
-
徐康 committed
-
xiaoer.li@freemud.com committed
-
zhiheng.zhang 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 # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java
zhiheng.zhang committed -
zhiheng.zhang committed
-
徐康 committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/mccafe/impl/CouponClientServiceImpl.java
徐康 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/enums/OldOrderAccountType.java # order-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java
徐康 committed -
徐康 committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # order-application-service/pom.xml
刘鹏飞 committed -
刘鹏飞 committed
-
xiaoer.li@freemud.com committed
-
徐康 committed
-