合并修改冲突

src/main/resources/mapper/TaPersonMapper.xml

@@ -258,7 +258,6 @@ FROM
                ta_person tp
              LEFT JOIN
             ( SELECT *, MAX(visit_time) as max_visit_time FROM ta_person_visit_record where org_id = #{org} GROUP BY  person_id  ) as tpvr
-                ( SELECT *, MAX(visit_time) as max_visit_time FROM ta_person_visit_record where org_id = #{org} GROUP BY  person_id  ) as tpvr
             ON tp.person_id = tpvr.person_id
              where tp.org_id = #{org} AND tp.person_type IN ('customer','drift','estate agent')
              GROUP BY DATE_FORMAT( tpvr.max_visit_time , '%Y-%m-%d' )