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

zainali5120

2021-04-22 495e9dcc80d830d9da9ad677f5c245b5fc4cbfa6

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

@@ -48,14 +48,16 @@
    * 内容
    */


   private String  content;
	

   private String  htmlImg;

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


   public static final Integer STATE_START = 1;
   public static final Integer STATE_END = 2;
   private Integer  state;
   
   /**