merge conflict

src/main/java/com/reyun/service/impl/EventServiceImpl.java

@@ -1029,7 +1029,6 @@ public class EventServiceImpl implements EventService {
                         } catch (Exception e) {
                             result.put("value", valueList);
                         }
-
                     } else {
                         result.put("value", valueList);
                     }