Merge branches 'cpv' and 'feature/撮合交易' of https://gitee.com/chonggaoxiao/new_excoin into cpv

# Conflicts:
#	src/main/java/com/xcong/excoin/modules/blackchain/service/UsdtEthService.java
#	src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java
#	src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
#	src/main/java/com/xcong/excoin/processor/DefaultCoinProcessor.java
#	src/main/java/com/xcong/excoin/quartz/job/KLineGeneratorJob.java
#	src/main/java/com/xcong/excoin/quartz/job/NotionalPoolingJob.java
#	src/main/resources/application-prod.yml
#	src/main/resources/mapper/member/MemberAuthenticationDao.xml