parent: c8bbb8 | patch | commitdiff
zainali5120
2020-11-15 47b56397ce10d4927ccc303539c103cf5d5dbe30
refs
author zainali5120 <512061637@qq.com>
Sunday, November 15, 2020 20:28 +0800
committer zainali5120 <512061637@qq.com>
Sunday, November 15, 2020 20:28 +0800
commit47b56397ce10d4927ccc303539c103cf5d5dbe30
tree e1bebc8f63cf6a72d35259434e044ca1fee8bffd tree | zip | gz
parent c8bbb87364e02f3ffe538173f98b2a2192e9f974 view | diff
bbbd0bb2a74f39af7ab213ea3a7cde1e211fe430 view | diff 
Merge branches 'cpv' and 'feature/撮合交易' of https://gitee.com/chonggaoxiao/new_excoin into cpv

# Conflicts:
#	src/main/java/com/xcong/excoin/common/enumerates/SymbolEnum.java
#	src/main/java/com/xcong/excoin/modules/blackchain/service/UsdtEthService.java
#	src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
#	src/main/java/com/xcong/excoin/rabbit/consumer/ExchangeConsumer.java
#	src/main/java/com/xcong/excoin/utils/mail/Sms106Send.java
#	src/main/resources/application-prod.yml
#	src/main/resources/application-prodapp.yml
#	src/main/resources/application-test.yml
#	src/main/resources/application.yml
10 files modified
110 ■■■■■ changed files
src/main/java/com/xcong/excoin/common/system/controller/CommonController.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/common/system/service/CommonService.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/common/system/service/impl/CommonServiceImpl.java 23 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java 3 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java 7 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberBindEmailDto.java 9 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberBindPhoneDto.java 11 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java 23 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/processor/DefaultCoinProcessor.java 22 ●●●●● diff | view | raw | blame | history
src/test/java/com/xcong/excoin/TradeTest.java 8 ●●●●● diff | view | raw | blame | history