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

xiaoyong931011

2021-05-12 f1ad6e801cc68cfe90efb620df3484293044aea3

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

@@ -14,5 +14,7 @@
   private Long id;
   @ApiModelProperty("是否可跳转 1-是2-否")
   private int isJump;
   @ApiModelProperty("H5图片链接")
   private String  htmlImg;

}