- 06 Aug, 2021 1 commit
-
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed
-
- 05 Aug, 2021 13 commits
-
-
周晓航 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
周晓航 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Merge branches 'feature/20210717_买虚拟商品特价_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # Conflicts: # order-application-service/pom.xml # order-management/pom.xml
ping.wu committed -
ping.wu committed
-
Merge branches 'feature/20210717_买虚拟商品特价_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
ping.wu committed
-
hanghang.wang committed
-
hanghang.wang committed
-
hanghang.wang committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java # order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java # ordercenter-sdk/pom.xml # pom.xml # shopping-cart-application-service/pom.xml
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed
-
- 04 Aug, 2021 11 commits
-
-
Merge branches 'feature/20210729_消息通知改造_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # Conflicts: # call-back-service/src/main/java/cn/freemud/service/impl/OrderCallBackServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/demo/manager/promotion/KgdPromotionServiceImpl.java
ping.wu committed -
ping.wu committed
-
Merge branches 'feature/20210717_买虚拟商品特价_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group # Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
ping.wu committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
hanghang.wang committed
-
hanghang.wang committed
-
hanghang.wang committed
-
hanghang.wang committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
李学兴 committed
-
李学兴 committed
-
- 03 Aug, 2021 15 commits
-
-
Merge branches 'feature/20210728_购物车满赠优惠空判断_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
Merge branches 'feature/20210728_购物车满赠优惠空判断_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
ping.wu committed
-
ping.wu committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Merge branches 'feature/20210728_购物车满赠优惠空判断_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
Merge branches 'feature/20210728_购物车满赠优惠空判断_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java # order-application-service/pom.xml # order-management/pom.xml # ordercenter-sdk/pom.xml # pom.xml # shopping-cart-application-service/pom.xml
ping.wu committed -
ping.wu committed
-
ping.wu committed
-
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
周晓航 committed -
Merge branches 'feature/20210728_购物车满赠优惠空判断_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
ping.wu committed
-
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
周晓航 committed
-
