Merge branch 'master' of https://github.com/java110/MicroCommunity

shiyj

2019-07-07 348c483d9e8cf81c485289a44c717fe1c23f4065

 java110-db/src/main/resources/mapper/room/RoomServiceDaoImplMapper.xml

@@ -134,7 +134,14 @@
</if> 
<if test="roomId !=null and roomId != ''">
   and t.room_id= #{roomId}
</if> 
</if>

<if test="roomIds != null">
    and t.room_id in
    <foreach collection="roomIds" item="item" open="(" close=")" separator=",">
        #{item}
    </foreach>
</if>
<if test="layer !=null and layer != ''">
   and t.layer= #{layer}
</if>