Merge remote-tracking branch 'origin/xinghong-dev'

java110

2021-04-01 3b0ddfa0b1c3490fbbf421a84e0431a60fb58387

 java110-db/src/main/resources/mapper/user/OwnerRoomRelServiceDaoImplMapper.xml

@@ -108,8 +108,8 @@
        <if test="relId !=null and relId != ''">
            and t.rel_id= #{relId}
        </if>
        <if test="relId !=null and relId != ''">
            and t.rel_id= #{relId}
        <if test="roomId !=null and roomId != ''">
            and t.room_id= #{roomId}
        </if>
        <if test="statusCd !=null and statusCd != ''">
            and t.status_cd= #{statusCd}