Merge remote-tracking branch 'origin/master_saas' into master_saas

mec-biz/src/main/resources/config/mybatis/ImLiveRoomReservationMapper.xml

@@ -67,8 +67,8 @@
 
     <select id="selectCountRoomReservation" resultType="com.ym.mec.biz.dal.vo.ImLiveBroadcastRoomVo">
         select
-        lbr.room_uid_,
-        count(1)
+        lbr.room_uid_ as roomUid,
+        count(1) as roomReservationNum
         from im_live_room_reservation lbr
 
         <where>