exchange.git - Gitblit

xiaoyong931011

2020-05-28 9419faa169d5e4826f59e33d436a88ab8ad7dfea

refs
author	xiaoyong931011 <15274802129@163.com>
	Thursday, May 28, 2020 16:40 +0800
committer	xiaoyong931011 <15274802129@163.com>
	Thursday, May 28, 2020 16:40 +0800
commit	9419faa169d5e4826f59e33d436a88ab8ad7dfea
tree	837c08acdada223d00bd2c73d63c99df37a0ca8c tree \| zip \| gz
parent	277061a61a93fcf737d111e81b5df8f8116b7896 view \| diff 4d08b2cd312f837a0ea02641d973acd234567797 view \| diff

Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin.git

1 files renamed

4 files modified

2 files added

	src/main/java/com/xcong/excoin/modules/contract/parameter/dto/SubmitEntrustDto.java	4 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java	48 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/xcong/excoin/modules/platform/dao/TradeSettingDao.java	6 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/xcong/excoin/modules/platform/entity/PlatformSymbolsSkuEntity.java	4 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/xcong/excoin/utils/CacheSettingUtils.java	82 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/xcong/excoin/utils/CoinTypeConvert.java	50 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/mapper/platform/TradeSettingDao.xml	10 ●●●●● diff \| view \| raw \| blame \| history