冲突解决

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java

@@ -58,6 +58,7 @@ public class ResiEventController {
         ValidatorUtils.validateEntity(formDTO);
         return new Result<EventDetailResultDTO>().ok(resiEventService.eventDetail(formDTO, tokenDto));
     }
+
     /**
      * 我要报事-提交（尹）
      *
@@ -172,7 +173,8 @@ public class ResiEventController {
         formDTO.setUserId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(formDTO, UserMentionFormDTO.AddUserInternalGroup.class);
         return new Result<List<UserMentionResultDTO>>().ok(resiEventService.mentionList(formDTO));
-    }}
+    }
+
     /**
      * @Description 最新直报
      * @Param userId
@@ -200,3 +202,4 @@ public class ResiEventController {
         resiEventService.closeResiEvent(formDTO);
         return new Result();
     }
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java

@@ -89,7 +89,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
     private ProjectDao projectDao;
     @Autowired
     private ResiEventReplyDao resiEventReplyDao;
-y
+
     /**
      * @Description  群众直报（待处理、处理中、已办结）列表
      *   未处理：按照创建时间正序；