- 13 Oct, 2020 30 commits
-
-
huiyang.chen committed
-
huiyang.chen committed
-
Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
ping.wu committed -
ping.wu committed
-
ping.wu committed
-
huiyang.chen committed
-
huiyang.chen committed
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
yu.sun committed
-
yu.sun committed
-
徐康 committed
-
徐康 committed
-
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.java # shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/activity/ActivityDiscountsDto.java
huiyang.chen committed -
徐康 committed
-
徐康 committed
-
huiyang.chen committed
-
ping.wu committed
-
ping.wu committed
-
ping.wu committed
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
徐康 committed -
徐康 committed
-
徐康 committed
-
ping.wu committed
-
ping.wu committed
-
徐康 committed
-
徐康 committed
-
- 12 Oct, 2020 10 commits
-
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
yu.sun committed
-
yu.sun committed
-
yu.sun committed
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java
徐康 committed -
yu.sun committed
-
xiaoer.li@freemud.com committed
-