Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents

src/main/java/com/huiju/estateagents/entity/TaNews.java

@@ -101,6 +101,11 @@ public class TaNews implements Serializable {
      */
     private Integer saveNum;
 
+    /**
+     * 分享数量
+     */
+    private Integer shareNum;
+
     /**
      * 类型
      */

src/main/resources/mapper/TaPersonMapper.xml

@@ -256,7 +256,9 @@ FROM
                 tpvr.visit_time AS visit_time
             FROM
                ta_person tp
-            INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
+             LEFT JOIN
+            ( SELECT * FROM ta_person_visit_record GROUP BY  person_id  ) as tpvr
+            ON tp.person_id = tpvr.person_id
              where ifnull(tp.person_type, '') != #{personType}
         ) AS temp ON temp_date.date = DATE_FORMAT( temp.visit_time , '%Y-%m-%d' )
     </select>