Merge branch 'saas_hgw_2022_6_6' into master_saas

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

@@ -49,9 +49,9 @@
         from im_live_broadcast_room
         where popularize_type_ = 'ALL'
         union all
-        select *
+        select a.*
         from im_live_broadcast_room as a
-        inner join from im_live_room_purview as b on a.room_uid_ = b.room_uid_
+        inner join im_live_room_purview as b on a.room_uid_ = b.room_uid_
         where b.user_id_ = #{param.userId}
         ) as a
         left join tenant_info AS t on a.tenant_id_ = t.id_