Merge branch 'feature_asset'

mitao

3 天以前 f409bb23163dfa6c3f0508f6b90a1caacc7b9518

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TDeptController.java

@@ -78,7 +78,7 @@
        if (!users.isEmpty()){
            return R.fail("当前部门存在用户，不可删除!");
        }
        deptService.removeById(id);
        deptService.removeById(Integer.valueOf(id));
        return R.ok();
    }
}