From 3341b7a0e2a8c719cf6eaf1591a721ec6b8e1fe4 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Tue, 25 May 2021 14:42:51 +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 | 5 +++-- 1 files changed, 3 insertions(+), 2 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 17f0e7c..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,9 +48,10 @@ * 内容 */ - private String content; - + + private String htmlImg; + /** * 活动状态1:开始2结束 */ -- Gitblit v1.9.1