fix conflect

Helius

2020-07-31 829d77f7145514d67d957ad54dbef854440f77d3

 src/main/java/com/xcong/excoin/modules/documentary/service/DocumentaryService.java

@@ -44,4 +44,6 @@


   public Result getFollowTraderProfit(long traderId);



   public Result beTrader();



}