- 27 Jul, 2021 26 commits
-
-
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 -
周晓航 committed
-
王世昌 committed
-
王世昌 committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
Merge remote-tracking branch 'origin/feature/20210720-购物车日志修改-张志恒' into feature/20210720-购物车日志修改-张志恒 # Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/aop/WebAspect.java
zhiheng.zhang committed -
zhiheng.zhang committed
-
周晓航 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Merge remote-tracking branch 'origin/feature/20210720-购物车日志修改-张志恒' into feature/20210720-购物车日志修改-张志恒
李学兴 committed -
李学兴 committed
-
李学兴 committed
-
李学兴 committed
-
zhiheng.zhang committed
-
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/factory/AbstractShoppingCartImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
zhiheng.zhang committed -
李学兴 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
ping.wu committed -
Merge branches 'feature/20210715_购物车可用优惠券改造_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group # Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
ping.wu committed -
王世昌 committed
-
Merge branches 'feature/20210714_微商城运费到付_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
ping.wu committed
-
- 26 Jul, 2021 4 commits
-
-
Merge remote-tracking branch 'origin/feature/20210720-购物车日志修改-张志恒' into feature/20210720-购物车日志修改-张志恒
ping.wu committed -
ping.wu committed
-
Merge branches 'feature/20210712_支付宝订单状态推送_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
李学兴 committed
-
- 23 Jul, 2021 10 commits
-
-
ping.wu committed
-
ping.wu committed
-
Merge remote-tracking branch 'origin/feature/20210720-购物车日志修改-张志恒' into feature/20210720-购物车日志修改-张志恒 # Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/aop/WebAspect.java
ping.wu committed -
ping.wu committed
-
Merge branch 'feature/20210720-购物车日志修改-张志恒' of gitlab.freemud.com:order-group-application/order-group into feature/20210720-购物车日志修改-张志恒
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Merge remote-tracking branch 'origin/feature/20210720-购物车日志修改-张志恒' into feature/20210720-购物车日志修改-张志恒 # Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/aop/WebAspect.java
zhiheng.zhang committed -
zhiheng.zhang committed
-
ping.wu committed
-
ping.wu committed
-
