Merge remote-tracking branch 'origin/activity' into activity

zainali5120

2021-03-31 55a4f22db43ec34bc7f59103f4a94005bd613850

 src/main/java/com/xcong/excoin/modules/activity/entity/ActivityMain.java

@@ -48,9 +48,10 @@
    * 内容
    */


   private String  content;
	

   private String  htmlImg;

   /**
    * 活动状态1:开始2结束
    */