Merge remote-tracking branch 'origin/master'

xiangpei

2024-07-02 a6a3bb04cdaa334a2868d09b20518ed98575bccb

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

@@ -43,6 +43,12 @@
        return RestResponse.ok(subjects);
    }

    @RequestMapping(value = "/subject/select/dept/{deptId}", method = RequestMethod.GET)
    public RestResponse<List<Subject>> listByDeptId(@PathVariable("deptId") Integer deptId) {
        List<Subject> subjects = subjectService.listByDeptId(deptId);
        return RestResponse.ok(subjects);
    }

    @RequestMapping(value = "/subject/page", method = RequestMethod.POST)
    public RestResponse<PageInfo<SubjectResponseVM>> pageList(@RequestBody SubjectPageRequestVM model) {
        PageInfo<Subject> pageInfo = subjectService.page(model);
@@ -91,6 +97,7 @@
        return RestResponse.ok(vm);
    }


    @RequestMapping(value = "/subject/delete/{id}", method = RequestMethod.POST)
    public RestResponse delete(@PathVariable Integer id) {
        Subject subject = subjectService.selectById(id);