- 28 Aug, 2020 17 commits
-
-
Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
ping.wu committed
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
ping.wu committed
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
vega committed -
张洪旺 committed
-
张洪旺 committed
-
Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
ping.wu committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/fuyou/service/FuYouOrderService.java
张洪旺 committed -
张洪旺 committed
-
- 27 Aug, 2020 22 commits
-
-
徐康 committed
-
张洪旺 committed
-
张洪旺 committed
-
张洪旺 committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
张洪旺 committed -
张洪旺 committed
-
Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
ping.wu committed
-
# Conflicts: # order-application-service/pom.xml # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md
张洪旺 committed -
张洪旺 committed
-
张洪旺 committed
-
vega committed
-
vega committed
-
vega committed
-
徐康 committed
-
徐康 committed
-
vega committed
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
张洪旺 committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/OrderApplication.java
张洪旺 committed
-
- 26 Aug, 2020 1 commit
-
-
张洪旺 committed
-
