Conflicts: epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectCategoryDictService.java epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventCategoryService.java epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventCategoryServiceImpl.java epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml