Merge branch 'aliyun_real_xhxu' into release_toaliyun_real

mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml

@@ -155,9 +155,6 @@
         <if test=" null != tenantId and '' != tenantId">
             and `tenant_id` = #{tenantId}
         </if>
-        <if test=" null != parentTenantId and '' != parentTenantId">
-            and `parent_tenant_id` = #{parentTenantId}
-        </if>
         <if test=" null != bopenId ">
             and `bopen_id`=#{bopenId}
         </if>
@@ -217,9 +214,6 @@
         <if test=" null != tenantId and '' != tenantId">
             and `tenant_id` = #{tenantId}
         </if>
-        <if test=" null != parentTenantId and '' != parentTenantId">
-            and `parent_tenant_id` = #{parentTenantId}
-        </if>
         <if test=" null != phone ">
             and `phone`=#{phone}
         </if>