Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into test

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

@@ -183,6 +183,7 @@
         <foreach collection="memberIds" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>
+		and mrs.del_flag_ = 0
         group by mrs.id_
     </select>
 </mapper>

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

@@ -25,7 +25,7 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="WaitSendMessage">
-		SELECT * FROM wait_send_message where tenant_id_ = #{tenantId} ORDER BY id_
+		SELECT * FROM wait_send_message ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->