exchange.git - Gitblit

xiaoyong931011

2021-05-14 c5ac51a5525b261127845a38a1fec5a86c860441

refs
author	xiaoyong931011 <15274802129@163.com>
	Friday, May 14, 2021 20:00 +0800
committer	xiaoyong931011 <15274802129@163.com>
	Friday, May 14, 2021 20:00 +0800
commit	c5ac51a5525b261127845a38a1fec5a86c860441
tree	83c42d12029cc6bcdf93853511d65e515b2ec8bc tree \| zip \| gz
parent	0fe1b435df537bb08e9572d4d5fc57b04f0c093b view \| diff c1d4d95aeb2cf3572401d7bc00ab6af0ba38a4d5 view \| diff

Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding

5 files modified

	src/main/java/com/xcong/excoin/modules/blackchain/service/Trc20Service.java	6 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/xcong/excoin/modules/member/dao/MemberDao.java	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java	20 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/mapper/member/MemberDao.xml	4 ●●●●● diff \| view \| raw \| blame \| history
	src/test/java/com/xcong/excoin/XchTest.java	2 ●●●●● diff \| view \| raw \| blame \| history