合代码冲突

designer-base/src/main/java/com/fr/design/notification/SnapChat.java

@@ -7,13 +7,6 @@ package com.fr.design.notification;
  **/
 public interface SnapChat {
     
-    /**
-     * 默认状态
-     *
-     * @return 默认状态
-     */
-    boolean defaultStatus();
-    
     /**
      * 已读
      *

designer-base/src/main/java/com/fr/design/notification/SnapChatConfig.java

@@ -31,7 +31,8 @@ public class SnapChatConfig implements XMLable {
     public Boolean hasRead(String key) {
         
         Map<String, Boolean> map = markReadMap;
-        return map.get(key);
+        Boolean val = map.get(key);
+        return val == null ? Boolean.FALSE : val;
     }
     
     public void markRead(String key) {
@@ -39,11 +40,6 @@ public class SnapChatConfig implements XMLable {
         markReadMap.put(key, Boolean.TRUE);
     }
     
-    public void resetRead(String key) {
-    
-        markReadMap.put(key, Boolean.FALSE);
-    }
-    
     @Override
     public void readXML(XMLableReader reader) {