From 400c712a036e97878fe63944ed2cfba303ab178c Mon Sep 17 00:00:00 2001 From: nidapeng <jp@doumee.com> Date: 星期一, 06 五月 2024 14:23:26 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/meeting/meeting_service/src/main/java/com/doumee/dao/business/RoomsMapper.java | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/RoomsMapper.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/RoomsMapper.java index a24e01b..8e84c41 100644 --- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/RoomsMapper.java +++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/RoomsMapper.java @@ -21,19 +21,17 @@ - @Select(" SELECT * FROM rooms " + + @Select(" SELECT * FROM meeting_rooms " + " ${ew.customSqlSegment} ") List<RoomsResponse> getRoomsList(@Param(Constants.WRAPPER) Wrapper wrapper); - - @Select(" select * from rooms " + + @Select(" select * from meeting_rooms " + " ${ew.customSqlSegment} ") IPage<RoomsResponse> myRoomsPage(IPage<RoomsResponse> page, @Param(Constants.WRAPPER) Wrapper wrapper); - - @Select(" select * from rooms " + + @Select(" select * from meeting_rooms " + " where id = #{id} ") RoomsResponse myRoomsDetail(@Param("id") Integer id); -- Gitblit v1.9.3