fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

 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;