Chopper 62804941c2 Merge remote-tracking branch 'origin/feature/pg' into test ...

# Conflicts:
#	framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java

2022-01-11 17:39:46 +08:00

..

main

Merge remote-tracking branch 'origin/feature/pg' into test

2022-01-11 17:39:46 +08:00

test/java/cn/lili/buyer/test

修复店铺结算单结算金额对于积分商品和砍价商品重复计算问题

2022-01-10 18:04:21 +08:00