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

src/main/java/com/yxproject/start/api/AdminApi.java

@@ -274,45 +274,6 @@ public class AdminApi {
         return list;
     }
 
-    /**
-     * 角色删除;
-     * @return
-     */
-//    @GET
-//    @Path("roleDel")
-//    @RequiresPermissions("role.del")
-//    public String roleDel(@QueryParam("roleId") String roleId,@Context HttpServletResponse response){
-//        response.setCharacterEncoding("UTF-8");
-//        Map map = new HashMap();
-//        boolean flag = false;
-//        flag = sysRoleService.deleteRole(Integer.parseInt(roleId));
-//        if(flag){
-//            map.put("returnMsg","删除成功");
-//        }else{
-//            map.put("returnMsg","删除失败");
-//        }
-//        return map.toString();
-//    }
-
-
-//    @GET
-//    @Path("roleBack")
-//    public String roleBack(@QueryParam("roleId") String roleId,@Context HttpServletResponse response){
-//        response.setCharacterEncoding("UTF-8");
-//        Map map = new HashMap();
-//        boolean flag = false;
-//        flag = sysRoleService.backRole(Integer.parseInt(roleId));
-//        if(flag){
-//            map.put("returnMsg","启用成功");
-//        }else{
-//            map.put("returnMsg","启用失败");
-//        }
-//        return map.toString();
-//    }
-
-
-
-
     @RequestMapping("roleAdd")
     public Map<String,String>  roleAdd(@RequestBody String jsonStr,HttpServletResponse resp) {
         resp.setCharacterEncoding("UTF-8");

src/main/java/com/yxproject/start/api/UserApi.java

@@ -38,9 +38,6 @@ public class UserApi {
     @Autowired
     private PoliceStationApplyReasonService policeStationApplyReasonService;
 
-    @Autowired
-    private SysPermissionService sysPermissionService;
-
     @Autowired
     private FailedCardService failedCardService;