- 09 Aug, 2021 2 commits
- 05 Aug, 2021 10 commits
-
-
胡博文 committed
-
胡博文 committed
-
胡博文 committed
-
胡博文 committed
-
胡博文 committed
-
Merge branches 'feature/20210717_买虚拟商品特价_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group # Conflicts: # order-application-service/pom.xml # order-management/pom.xml
ping.wu committed -
ping.wu committed
-
Merge branches 'feature/20210717_买虚拟商品特价_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
ping.wu committed
-
王世昌 committed
-
- 04 Aug, 2021 1 commit
-
-
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
-
- 03 Aug, 2021 19 commits
-
-
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
-
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
-
ping.wu committed
-
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
ping.wu committed
-
周晓航 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
ping.wu committed
-
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
周晓航 committed -
Merge branches 'feature/20210719_会员价改造查促销_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group # Conflicts: # order-application-service/src/main/java/cn/freemud/service/thirdparty/StoreClient.java # shopping-cart-application-service/src/main/java/cn/freemud/demo/manager/promotion/KgdPromotionServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CalculationClient.java
ping.wu committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
ping.wu committed
-
- 02 Aug, 2021 8 commits
-
-
ping.wu committed
-
ping.wu committed
-
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
-
Merge branches 'feature/20210728_购物车满赠优惠空判断_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
ping.wu committed
-
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/enums/SubmitPageEnum.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
周晓航 committed
-
