parent: 2a6df7 | patch | commitdiff
zainali5120
2020-11-15 5f3f7f33303c1b96a36de3b91155e49f3a56ff09
refs
author zainali5120 <512061637@qq.com>
Sunday, November 15, 2020 20:36 +0800
committer zainali5120 <512061637@qq.com>
Sunday, November 15, 2020 20:36 +0800
commit5f3f7f33303c1b96a36de3b91155e49f3a56ff09
tree 3dd752f62ed23fcc3b1867c66b1a0659b0c425e1 tree | zip | gz
parent 2a6df70da19c093e1a16f80acc38d7c3fbb76186 view | diff
bfb771a3ea2dcb39c9b299bc37e6986139c07d3c view | diff 
Merge branches 'cpv-back' and 'roc-bak' of https://gitee.com/chonggaoxiao/new_excoin_manage into cpv-back

# Conflicts:
#	src/main/java/com/xcong/excoin/modules/Sms106Send.java
#	src/main/java/com/xcong/excoin/modules/member/service/EthService.java
#	src/main/java/com/xcong/excoin/modules/member/service/RocService.java
#	src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
#	src/main/java/com/xcong/excoin/modules/trademanage/mapper/OrderCoinDealMapper.java
#	src/main/resources/application-prod.yml
#	src/main/resources/mapper/modules/MemberCoinWithdrawMapper.xml
#	src/main/resources/templates/febs/views/modules/member/withdrawCoin.html
10 files modified
1 files deleted
5 files added
573 ■■■■■ changed files
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/entity/TdFinancialReord.java 59 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/mapper/MemberCoinAddressMapper.java 7 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/mapper/MemberWalletCoinMapper.java 1 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/mapper/TdFinancialReordDao.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java 54 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/trademanage/controller/TradeManageController.java 153 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/trademanage/mapper/OrderCoinDealMapper.java 2 ●●●●● diff | view | raw | blame | history
src/main/resources/application-test.yml 10 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/modules/MemberCoinAddressMapper.xml 7 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/modules/MemberCoinWithdrawMapper.xml 8 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/modules/TdFinancialRecordDao.xml 7 ●●●●● diff | view | raw | blame | history
src/main/resources/static/layui/css/layui.css 2 ●●●●● diff | view | raw | blame | history
src/main/resources/templates/febs/views/modules/member/limit.html 94 ●●●●● diff | view | raw | blame | history
src/main/resources/templates/febs/views/modules/member/withdrawCoin.html 17 ●●●●● diff | view | raw | blame | history
src/main/resources/templates/febs/views/modules/orderCoin/orderCoin.html 137 ●●●●● diff | view | raw | blame | history