Merge remote-tracking branch 'origin/master'

xiangpei

2024-07-15 579e16edf3640235bc11934f58b4680ab809582a

 src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java

@@ -79,7 +79,7 @@

    @RequestMapping(value = "/get/{id}", method = RequestMethod.POST)
    public RestResponse update(@PathVariable Integer id) {
        return RestResponse.ok(departmentService.getById(id));
        return RestResponse.ok(departmentService.getByIdVO(id));
    }

    @RequestMapping(value = "/getUserByDepartment/{id}", method = RequestMethod.POST)