Merge branch 'feature_asset'

mitao

5 天以前 ab0ad84b5c577036f9ed5b53d2e90e81e5ba3de9

 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();
    }
}