parent: f3134a | patch | commitdiff
xiaoyong931011
2021-04-06 bf68aa759bc3c0a858d80cb3d1ae1f1682cd6c94
refs
author xiaoyong931011 <15274802129@163.com>
Tuesday, April 6, 2021 15:38 +0800
committer xiaoyong931011 <15274802129@163.com>
Tuesday, April 6, 2021 15:38 +0800
commitbf68aa759bc3c0a858d80cb3d1ae1f1682cd6c94
tree 2bab2ce8d7e5e5fd60b2b4a223631e5e55725fef tree | zip | gz
parent f3134a2269d7c14e3a73c6407139e6d8973e58a9 view | diff
48e20b2b0f03c52a904271b177678f9f8818754d view | diff 
Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity

 Conflicts:
	src/test/java/com/xcong/excoin/FollowTest.java
8 files modified
635 ■■■■■ changed files
src/main/java/com/xcong/excoin/modules/blackchain/service/Impl/BlockSeriveImpl.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/documentary/common/NoticeConstant.java 5 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/documentary/service/FollowOrderOperationService.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/documentary/service/impl/FollowOrderOperationServiceImpl.java 68 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/rabbit/consumer/FollowConsumer.java 16 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/rabbit/producer/FollowProducer.java 22 ●●●●● diff | view | raw | blame | history
src/test/java/com/xcong/excoin/FollowTest.java 512 ●●●●● diff | view | raw | blame | history