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

zainali5120

2021-05-12 2720d8d8e2ea1a03e6dd42809d75f788349f66c8

 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;