Merge remote-tracking branch 'origin/master'

xiangpei

2024-06-19 5ff3d0d90f6f46f9d48c6852884edb16ecc78ad3

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

@@ -24,7 +24,7 @@
@Validated
@RequiredArgsConstructor
@Api(value = "会议表", tags = "会议表管理")
@RestController
@RestController("StudentMeetController")
@RequestMapping("api/student/meet")
public class MeetController {

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

    @GetMapping("/{id}")