merge conflict

d18828bb · carrieyzzhang · fcc348c8 · a15626d5 · d18828bb
Commit d18828bb authored Mar 30, 2018 by carrieyzzhang
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

EventServiceImpl.java src/main/java/com/reyun/service/impl/EventServiceImpl.java +0 -1

No files found.
--- a/src/main/java/com/reyun/service/impl/EventServiceImpl.java
+++ b/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);
                    }