合并

src/main/java/com/huiju/estateagents/entity/SysButtonInMenu.java

@@ -50,7 +50,6 @@ public class SysButtonInMenu implements Serializable {
     
     private String remark;
 
-    private String remark;
 
     @TableField(exist = false)
     private List<Integer> roles;

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -136,11 +136,11 @@ public class AccessInterceptor implements HandlerInterceptor {
             return false;
         }
         
-        //按钮权限校验
+//        按钮权限校验
         boolean state = checkButtonRole(request);
         if (!state){
             ResponseBean resp = ResponseBean.error("权限验证非法" , ResponseBean.ERROR_AUTH_FAIL);
-        
+
             response.addHeader("Content-type", "application/json");
             response.getOutputStream().write(JSONObject.toJSONBytes(resp));
             return false;