Merge remote-tracking branch 'origin/activity' into activity

zainali5120

2021-04-25 a55747a7cedc4c4f04f33755a27862c959c1ad30

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

@@ -77,5 +77,7 @@


   public Result beTraderCondition();



   public Result getDocumentaryOrderSetState(String tradeId);





}