From e21fb7543c9199cfbaa7f44e99133eb747ad742c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 25 May 2021 15:04:17 +0800
Subject: [PATCH] Merge branch 'otc' of http://120.27.238.55:7000/r/exchange into otc

---
 src/main/java/com/xcong/excoin/modules/activity/entity/ActivityMain.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/activity/entity/ActivityMain.java b/src/main/java/com/xcong/excoin/modules/activity/entity/ActivityMain.java
index da64dc0..e6d6f7b 100644
--- a/src/main/java/com/xcong/excoin/modules/activity/entity/ActivityMain.java
+++ b/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;
 	
 	/**

--
Gitblit v1.9.1