From b129977dbaff2501459009577667ab11ed0163ab Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 28 十月 2024 18:31:07 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/jxkg-new
---
src/main/java/com/ycl/jxkg/controller/student/MeetController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/student/MeetController.java b/src/main/java/com/ycl/jxkg/controller/student/MeetController.java
index 52f85d7..44b8272 100644
--- a/src/main/java/com/ycl/jxkg/controller/student/MeetController.java
+++ b/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,11 +33,11 @@
@GetMapping("/page")
@ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
public Result page(MeetQuery query) {
- return meetService.page(query);
+ return meetService.studentPage(query);
}
@GetMapping("/{id}")
- @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
+ @ApiOperation(value = "瀛︾敓涓婅", notes = "瀛︾敓涓婅")
public Result detail(@PathVariable("id") Integer id) {
return meetService.detail(id);
}
--
Gitblit v1.8.0