Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity

xiaoyong931011

2021-03-25 facab577702e7c34182ce8fb13faf03f74363d93

 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;