合代码冲突

designer-base/src/main/java/com/fr/design/menu/SnapChatUpdateAction.java

@@ -32,8 +32,7 @@ public abstract class SnapChatUpdateAction extends UpdateAction implements SnapC
     public boolean hasRead() {
         
         String calcKey = calcKey();
-        Boolean val = SnapChatConfig.getInstance().hasRead(calcKey);
-        return val == null ? defaultStatus() : val;
+        return SnapChatConfig.getInstance().hasRead(calcKey);
     }
     
     @Override
@@ -43,12 +42,6 @@ public abstract class SnapChatUpdateAction extends UpdateAction implements SnapC
         SnapChatConfig.getInstance().markRead(calcKey);
     }
     
-    @Override
-    public boolean defaultStatus() {
-        
-        return false;
-    }
-    
     @Override
     public SnapChatKey key() {