Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/SettledCompanyInfoMapper.xml

@@ -128,7 +128,7 @@
         left join
         settled_company_info a
         on a.id = b.info_id
-        WHERE a.delete_flag = '0'
+        WHERE b.delete_flag = '0'
         <if test="loginPhone != null and loginPhone != ''">
             AND b.phone = #{loginPhone}
         </if>
@@ -161,11 +161,11 @@
         left join
         settled_company_info a
         on a.id = b.info_id
-        WHERE a.delete_flag = '0'
+        WHERE b.delete_flag = '0'
         <if test="loginPhone != null and loginPhone != ''">
             AND b.phone = #{loginPhone}
         </if>
-        ORDER BY a.status_flag asc , a.update_date DESC
+        ORDER BY a.status_flag asc , b.update_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>