Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -707,7 +707,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             List<ResiTopicOperationEntity> records =
                     resiTopicOperationDao.selectList(queryWrapper);
             if(null != records && records.size() > NumConstant.ZERO){
-                hiddenDetailDTO.setHiddenReason(records.get(0).getOperationReason());
+                hiddenDetailDTO.setHiddenReason(String.format("%s%s",ModuleConstant.HIDDEN_TOPIC_REASON_PREFIX,records.get(0).getOperationReason()));
                 hiddenDetailDTO.setHiddenDateTime(records.get(0).getCreatedTime().getTime()/NumConstant.ONE_THOUSAND);
                 ResiGroupMemberInfoRedisDTO hiddenBy =
                         resiGroupMemberRedis.get(topicDetail.getGroupId(),records.get(0).getCreatedBy());

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java

@@ -348,5 +348,7 @@ public interface ModuleConstant extends Constant {
 	 */
 	String CODE_INVITE_PAGE = "pages/group/group/invitation/invitation";
 
+	String HIDDEN_TOPIC_REASON_PREFIX = "话题已屏蔽：";
+
 	String CREATE_ISSUE_ERROR = "创建议题失败";
 }