Merge remote-tracking branch 'origin/kako' into kako

@@ -284,6 +284,9 @@ public class KakoUser implements UserDetails {
      */
     @Override
     public boolean isAccountNonLocked(){
+        if("1".equals(delFlag)){
+            return false;
+        }
         return true;
     }