- 10 Nov, 2021 11 commits
-
-
周晓航 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
-
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 14 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
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
徐光兴 committed -
徐光兴 committed
-
Merge branches 'feature/20211103_取消支付冲正库存幂等_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/impl/OrderQueueService.java
ping.wu committed -
ping.wu committed
-
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
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Merge branches 'feature/20211104_买m赠n券商品id问题_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
ping.wu committed
-
ping.wu committed
-
- 08 Nov, 2021 9 commits
-
-
查志伟 committed
-
陈斌 committed
-
陈斌 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 6 commits
-
-
周晓航 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Merge branches 'feature/20211104_买m赠n券商品id问题_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
Merge branches 'feature/20211104_买m赠n券商品id问题_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
商品券统一取商品对象CouponCode字段
ping.wu committed -
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java
周晓航 committed
-
