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

xiaoyong931011

2021-04-06 bf68aa759bc3c0a858d80cb3d1ae1f1682cd6c94

 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;

}