- 08 Jul, 2021 14 commits
-
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
李学兴 committed
-
李学兴 committed
-
周晓航 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Merge branches 'feature/20210624_购买虚拟商品校验是否在菜单_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
ping.wu committed
-
Merge branches 'feature/20210624_购买虚拟商品校验是否在菜单_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
ping.wu committed
-
周晓航 committed
-
李学兴 committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityApplicationClient.java
李学兴 committed
-
- 07 Jul, 2021 10 commits
-
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Merge branches 'feature/20210624_购买虚拟商品校验是否在菜单_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
周晓航 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
周晓航 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Merge branches 'feature/20210707_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group # Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
ping.wu committed -
ping.wu committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityApplicationClient.java
周晓航 committed -
ping.wu committed
-
- 06 Jul, 2021 6 commits
- 05 Jul, 2021 7 commits
-
-
李学兴 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
李学兴 committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/aop/WebAspect.java # order-application-service/src/main/java/cn/freemud/service/coupon/impl/PlatformCouponRelationServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java # ordercenter-sdk/pom.xml # shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartController.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
李学兴 committed -
ping.wu committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
王世昌 committed
-
- 02 Jul, 2021 3 commits
