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

zainali5120

2020-10-25 bef3b23ca8918a355f6ff9751b46f4c35970f19e

 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;