代码合并问题处理

src/main/java/com/zzsn/event/service/impl/EventServiceImpl.java

@@ -3,6 +3,7 @@ package com.zzsn.event.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -77,8 +78,6 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
     @Autowired
     private ISubjectInfoSourceMapService iSubjectInfoSourceMapService;
     @Autowired
-    private ISubjectKeywordsMapService iSubjectKeywordsMapService;
-    @Autowired
     private IEventTagService eventTagService;
     @Autowired
     private EventRegionMapService eventRegionMapService;