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

Helius

2021-05-13 17ee2c1ef2b679eb657db34286c244544e8f68cb

 src/main/java/com/xcong/excoin/modules/activity/vo/ActivityReceiveRecordVo.java

@@ -23,9 +23,9 @@
   private BigDecimal  subAmount;
   @ApiModelProperty("条件")
   private String  subConditions;
   @ApiModelProperty("激活状态1已激活2未激活3已领取")
   @ApiModelProperty("激活状态1已激活2未激活3已失效")
   private Integer  receiveState;
   @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
   @JsonFormat(pattern = "yyyy-MM-dd hh:mm", timezone = "GMT+8")
   @ApiModelProperty("失效时间")
   private Date invalidTime;