- 03 Aug, 2021 10 commits
-
-
# 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 -
周晓航 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 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 6 commits
-
-
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
-
- 31 Jul, 2021 1 commit
-
-
李学兴 committed
-
- 30 Jul, 2021 2 commits
-
-
Merge branches 'feature/20210720-购物车日志修改-张志恒' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
ping.wu committed
-
- 29 Jul, 2021 3 commits
-
-
Merge branches 'feature/20210720-购物车日志修改-张志恒' and 'master' of http://gitlab.freemud.com/order-group-application/order-group # Conflicts: # pom.xml
ping.wu committed -
ping.wu committed
-
ping.wu committed
-
- 28 Jul, 2021 7 commits
-
-
ping.wu committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
Merge branches 'feature/20210715_购物车可用优惠券改造_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
ping.wu committed
-
hanghang.wang committed
-
hanghang.wang committed
-
- 27 Jul, 2021 11 commits
-
-
周晓航 committed
-
ping.wu committed
-
Merge branches 'feature/20210727_扫桌码下单校验_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/20210720-购物车日志修改-张志恒' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
李学兴 committed
-
ping.wu committed
-
Merge branch 'feature/20210727_扫桌码下单校验_wuping' of http://gitlab.freemud.com/order-group-application/order-group
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/thirdparty/PromotionDiscountClient.java
ping.wu committed
-
