exchange.git - Gitblit

xiaoyong931011

2021-04-09 d0d0306f30ffcf22afda2da15c13df2b3a6060ee

refs
author	xiaoyong931011 <15274802129@163.com>
	Friday, April 9, 2021 16:01 +0800
committer	xiaoyong931011 <15274802129@163.com>
	Friday, April 9, 2021 16:01 +0800
commit	d0d0306f30ffcf22afda2da15c13df2b3a6060ee
tree	9e31dd91eea1d2e10cf85f1ed0af8dfe1e807e01 tree \| zip \| gz
parent	0f7c4c9e8e84ccb7786b63d3e2a29095a533e42d view \| diff 1c6bf3e15cf135fadcac5e4e40af418d8d0ab0b7 view \| diff

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

 Conflicts:
	src/test/java/com/xcong/excoin/LocalTest.java

5 files modified

	src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java	10 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/xcong/excoin/utils/CalculateUtil.java	66 ●●●●● diff \| view \| raw \| blame \| history
	src/test/java/com/xcong/excoin/LocalTest.java	21 ●●●●● diff \| view \| raw \| blame \| history
	src/test/java/com/xcong/excoin/WholeTest.java	39 ●●●●● diff \| view \| raw \| blame \| history