Merge remote-tracking branch 'origin/master'

nidapeng

2024-05-06 2a0e9e6f92c5f25a53aefa4edb708f42472e8a6e

 server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java

@@ -5,8 +5,8 @@
import com.doumee.core.model.PageWrap;
import com.doumee.dao.admin.response.DevWgResponseParam;
import com.doumee.dao.business.model.Bookings;
import com.doumee.dao.business.vo.RoomStatisticsVo;
import com.doumee.dao.system.dto.UserStatisticsDTO;
import com.doumee.dao.system.vo.RoomStatisticsVo;
import com.doumee.dao.system.vo.UserStatisticsVo;
import com.doumee.dao.web.request.BookingsRequest;
import com.doumee.dao.web.request.MeetingPageRequest;
@@ -185,7 +185,7 @@
     * @param yearNum
     * @return
     */
    List<RoomStatisticsVo> getRoomStatistics( Integer yearNum);
    List<RoomStatisticsVo> getRoomStatistics(Integer yearNum);


    /**