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/test

优化es商品索引的mapping的促销存储结构（解决促销过多时，mapping explosion问题）

2022-01-11 11:38:30 +08:00