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

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

@@ -110,7 +110,7 @@
     </select>
     <select id="queryTenantInfoByOrgan" resultType="com.ym.mec.biz.dal.entity.TenantInfo">
         select * from tenant_info
-        where id_ = (select id_ from organization where tenant_id_ = #{tenantId})
+        where id_ = (select tenant_id_ from organization where id_ = #{organId})
     </select>
 
 </mapper>