Merge branch 'master' into whole

Helius

2020-09-01 1eac25bee9fa9b09ee25fc6a945ef1a47b3b4299

 src/main/java/com/xcong/excoin/modules/documentary/vo/MyFollowOrderVo.java

@@ -54,6 +54,9 @@
   @ApiModelProperty("订单编号")

   private String orderNo;

   

   @ApiModelProperty("订单ID")

   private long orderId;

	
   @ApiModelProperty("交易员")

   private String nickname;