- 15 Nov, 2021 5 commits
-
-
Merge branches 'feature/20211112_1元捐插件_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # Conflicts: # order-application-service/src/main/java/cn/freemud/controller/OrderController.java
ping.wu committed -
ping.wu committed
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
- 12 Nov, 2021 11 commits
-
-
Merge branches 'feature/20211112_1元捐插件_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
ping.wu committed
-
Merge branches 'feature/20211112_1元捐插件_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
ping.wu committed
-
ping.wu committed
-
Merge branches 'feature/20211112_1元捐插件_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # Conflicts: # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
ping.wu committed -
ping.wu committed
-
查志伟 committed
-
查志伟 committed
-
查志伟 committed
-
查志伟 committed
-
- 11 Nov, 2021 7 commits
-
-
查志伟 committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
查志伟 committed -
周晓航 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java
徐康 committed -
徐康 committed
-
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java
徐康 committed
-
- 10 Nov, 2021 15 commits
-
-
徐光兴 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
-
查志伟 committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/calculate/ActivityCalculationDiscountResponseDto.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
查志伟 committed -
周晓航 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
徐光兴 committed -
徐光兴 committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
周晓航 committed
-
- 09 Nov, 2021 2 commits
-
-
Merge branches 'feature/20211103_取消支付冲正库存幂等_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
ping.wu committed
-
