Merge remote-tracking branch 'origin/master'

jiangping

2024-12-12 142f590c9b32435f22830421a9c6f1c1e5669f0f

 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);