- 23 Dec, 2021 6 commits
-
-
Merge branches 'feature/20211209_订单业务类型改造_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
ping.wu committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
查志伟 committed -
查志伟 committed
-
查志伟 committed
-
- 22 Dec, 2021 11 commits
-
-
Merge branches 'feature/20211209_订单业务类型改造_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
ping.wu committed
-
Merge branches 'feature/20211209_订单业务类型改造_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
ping.wu committed
-
Merge branch 'feature/20211220_购物车活动互斥提示_wuping' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
ping.wu committed
-
ping.wu committed
-
Merge branches 'feature/20211220_购物车活动互斥提示_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/factory/AbstractShoppingCartImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMallServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingCartService.java
ping.wu committed -
ping.wu committed
-
Merge branches 'feature/20211209_订单业务类型改造_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
ping.wu committed
-
- 21 Dec, 2021 4 commits
-
-
ping.wu committed
-
ping.wu committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/delivery/impl/GradDeliveryServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
周晓航 committed
-
- 20 Dec, 2021 5 commits
-
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/delivery/impl/GradDeliveryServiceImpl.java
查志伟 committed -
查志伟 committed
-
ping.wu committed
-
周晓航 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed
-
- 17 Dec, 2021 3 commits
-
-
Merge branches 'feature/20211213_保存spu商品货号_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
胡敬轩 committed
-
- 16 Dec, 2021 11 commits
-
-
Merge branches 'feature/20211209_订单业务类型改造_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # Conflicts: # order-application-service/src/main/java/cn/freemud/service/universal/impl/SaasMallOrderService.java
ping.wu committed -
ping.wu committed
-
ping.wu committed
-
徐康 committed
-
周晓航 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
周晓航 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
周晓航 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
周晓航 committed
-
