- 16 Nov, 2021 4 commits
-
-
查志伟 committed
-
Merge branches 'feature/20211103_取消支付冲正库存幂等_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
ping.wu committed
-
Merge branches 'feature/20211103_取消支付冲正库存幂等_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group # Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/OrderQueueService.java
ping.wu committed
-
- 15 Nov, 2021 4 commits
- 12 Nov, 2021 3 commits
- 10 Nov, 2021 4 commits
-
-
徐光兴 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
-
- 09 Nov, 2021 8 commits
- 08 Nov, 2021 7 commits
-
-
查志伟 committed
-
陈斌 committed
-
Merge branches 'feature/20211101_礼品卡消费记录渠道_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
查志伟 committed
-
ping.wu committed
-
查志伟 committed
-
Merge branches 'feature/20211027_餐盒费规则保存订单_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed
-
- 05 Nov, 2021 5 commits
- 04 Nov, 2021 5 commits
