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

xiangpei

2024-06-26 44aaa355ecf9430f8b182654d03c2914287bcba6

 src/main/java/com/ycl/jxkg/controller/student/MeetController.java

@@ -33,7 +33,7 @@
    @GetMapping("/page")
    @ApiOperation(value = "分页", notes = "分页")
    public Result page(MeetQuery query) {
        return meetService.page(query);
        return meetService.studentPage(query);
    }

    @GetMapping("/{id}")