Chopper 829472c6a3 Merge remote-tracking branch 'origin/qiuqiu' ...

合并砍价/积分相关

# Conflicts:
#	consumer/src/main/java/cn/lili/event/impl/MemberPointExecute.java
#	update-sql/version4.2to4.3.sql

2021-07-30 15:50:36 +08:00

..

application.yml

Merge remote-tracking branch 'origin/qiuqiu'

2021-07-30 15:50:36 +08:00