diff --git a/community-api/src/main/java/com/tanpu/community/api/beans/qo/CommentQo.java b/community-api/src/main/java/com/tanpu/community/api/beans/qo/CommentQo.java
index ea410e2d12a8d9d892e0ce329bc78de886518d31..71476ea1ec28a352714311f2d90cf7bab80fb9b3 100644
--- a/community-api/src/main/java/com/tanpu/community/api/beans/qo/CommentQo.java
+++ b/community-api/src/main/java/com/tanpu/community/api/beans/qo/CommentQo.java
@@ -23,6 +23,12 @@ public class CommentQo {
     @ApiModelProperty(value = "作者id")
     private String authorId;
 
+    @ApiModelProperty(value = "回复对象的用户id,根据这个来判断是否有回复对象")
+    private String replyUserId;
+
+    @ApiModelProperty(value = "回复对象的用户名")
+    private String replyUserName;
+
     @ApiModelProperty(value = "点赞次数")
     private Integer likeCount;
 
@@ -44,6 +50,7 @@ public class CommentQo {
     @ApiModelProperty(value = "是否讨论区管理员")
     private boolean isManager;
 
+
     // 认证标签相关
     @ApiModelProperty("认证标签用-用户等级体系 0 游客 1注册用户 10投资人 20 探普理顾 30 探普专家理顾 40 交易理财师 50 首席投顾")
     private Integer levelGrade;
diff --git a/community-service/src/main/java/com/tanpu/community/dao/CodeAutoGenerator.java b/community-service/src/main/java/com/tanpu/community/dao/CodeAutoGenerator.java
index 53a74d22a1b0073a6e9fef430e6d43a1a0fce3ec..3173d4dbb70164dfb6aae4f6dcbcce03e5bd641d 100644
--- a/community-service/src/main/java/com/tanpu/community/dao/CodeAutoGenerator.java
+++ b/community-service/src/main/java/com/tanpu/community/dao/CodeAutoGenerator.java
@@ -23,7 +23,7 @@ public class CodeAutoGenerator {
         String mysqlPassword = "@imeng123";
         String jdbcUrl = "jdbc:mysql://rm-uf6r22t3d798q4kmkao.mysql.rds.aliyuncs.com:3306/tamp_community";
         // String[] tables = new String[]{"theme"};
-       String[] tables = new String[]{"topic_follow_rel"};
+       String[] tables = new String[]{"comment"};
         String basePackage = "com.tanpu.community";
         String mapperPackage = "dao.mapper.community";
         String entityPackage = "dao.entity.community";
diff --git a/community-service/src/main/java/com/tanpu/community/dao/entity/community/CommentEntity.java b/community-service/src/main/java/com/tanpu/community/dao/entity/community/CommentEntity.java
index aff417b6b051d8feee5730bd503a3300d4602552..44b512586d46413c66a8296ccb2b18314d118f53 100644
--- a/community-service/src/main/java/com/tanpu/community/dao/entity/community/CommentEntity.java
+++ b/community-service/src/main/java/com/tanpu/community/dao/entity/community/CommentEntity.java
@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
  * </p>
  *
  * @author xudong
- * @since 2021-07-28
+ * @since 2022-02-18
  */
 @TableName("comment")
 @ApiModel(value="CommentEntity对象", description="评论")
@@ -54,6 +54,9 @@ public class CommentEntity implements Serializable {
     @ApiModelProperty(value = "回复评论id")
     private String replyId;
 
+    @ApiModelProperty(value = "回复对象的用户id")
+    private String replyUserId;
+
     @ApiModelProperty(value = "审核状态 0：初始值  1：已通过（管理后台使用）")
     private Integer reviewStatus;
 
@@ -131,6 +134,14 @@ public class CommentEntity implements Serializable {
         this.replyId = replyId;
     }
 
+    public String getReplyUserId() {
+        return replyUserId;
+    }
+
+    public void setReplyUserId(String replyUserId) {
+        this.replyUserId = replyUserId;
+    }
+
     public Integer getReviewStatus() {
         return reviewStatus;
     }
@@ -182,6 +193,7 @@ public class CommentEntity implements Serializable {
         ", themeId=" + themeId +
         ", parentId=" + parentId +
         ", replyId=" + replyId +
+        ", replyUserId=" + replyUserId +
         ", reviewStatus=" + reviewStatus +
         ", reportStatus=" + reportStatus +
         ", createTime=" + createTime +
diff --git a/community-service/src/main/java/com/tanpu/community/dao/mapper/community/CommentMapper.java b/community-service/src/main/java/com/tanpu/community/dao/mapper/community/CommentMapper.java
index e1c1da6d912e9bce92e1eb1e2d2c4e764e0a2c5c..a5dc51d5a80eebe57a7cf1fd804e8bdcc4151042 100644
--- a/community-service/src/main/java/com/tanpu/community/dao/mapper/community/CommentMapper.java
+++ b/community-service/src/main/java/com/tanpu/community/dao/mapper/community/CommentMapper.java
@@ -16,7 +16,7 @@ import java.util.List;
  * </p>
  *
  * @author xudong
- * @since 2021-07-22
+ * @since 2022-02-18
  */
 public interface CommentMapper extends BaseMapper<CommentEntity> {
 
diff --git a/community-service/src/main/java/com/tanpu/community/util/ConvertUtil.java b/community-service/src/main/java/com/tanpu/community/util/ConvertUtil.java
index 2f082a091522311bd214ef205db1551ba7034e8e..9eac1db54a6e15599d3a2a47b88df45e77b899e1 100644
--- a/community-service/src/main/java/com/tanpu/community/util/ConvertUtil.java
+++ b/community-service/src/main/java/com/tanpu/community/util/ConvertUtil.java
@@ -15,8 +15,8 @@ import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
 import com.tanpu.community.api.enums.DeleteTagEnum;
 import com.tanpu.community.api.enums.NotificationTypeEnum;
 import com.tanpu.community.api.enums.TopicSpecialPermissionEnum;
-import com.tanpu.community.dao.entity.NotificationLikeDO;
 import com.tanpu.community.dao.entity.NotificationForwardDO;
+import com.tanpu.community.dao.entity.NotificationLikeDO;
 import com.tanpu.community.dao.entity.community.CommentEntity;
 import com.tanpu.community.dao.entity.community.FileRecordEntity;
 import com.tanpu.community.dao.entity.community.NotificationEntity;
@@ -24,8 +24,8 @@ import com.tanpu.community.dao.entity.community.ThemeAttachmentEntity;
 import com.tanpu.community.dao.entity.community.ThemeEntity;
 import com.tanpu.community.dao.entity.community.TopicEntity;
 import com.tanpu.community.dao.entity.community.VisitLogEntity;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.util.StringUtils;
 
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
@@ -159,6 +159,9 @@ public class ConvertUtil {
         BeanUtils.copyProperties(entity, qo);
         qo.setContent(OtherUtil.blockPhoneAndEmail(entity.getContent()));
         qo.setUpdateTime(TimeUtils.getTimestampOfDateTime(entity.getUpdateTime()));
+        if (StringUtils.isBlank(entity.getReplyUserId())){
+            qo.setReplyUserId(null);
+        }
         return qo;
     }
 
diff --git a/community-service/src/main/resources/mapper/community/CommentEntityMapper.xml b/community-service/src/main/resources/mapper/community/CommentEntityMapper.xml
index 7fa67bdffb530d52fa2941995663bb34380027fd..ddc28e7bc519dc8b3ec03df581bc88e965fa6067 100644
--- a/community-service/src/main/resources/mapper/community/CommentEntityMapper.xml
+++ b/community-service/src/main/resources/mapper/community/CommentEntityMapper.xml
@@ -12,6 +12,7 @@
         <result column="theme_id" property="themeId" />
         <result column="parent_id" property="parentId" />
         <result column="reply_id" property="replyId" />
+        <result column="reply_user_id" property="replyUserId" />
         <result column="review_status" property="reviewStatus" />
         <result column="report_status" property="reportStatus" />
         <result column="create_time" property="createTime" />