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

src/main/resources/mapper/TaPersonMapper.xml

@@ -187,6 +187,7 @@ FROM
             <if test="startDate != null or endDate != null">
                 a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
             </if>
+
         ) AS temp_date
 
         LEFT JOIN (
@@ -213,7 +214,7 @@ FROM
 
             GROUP BY  tpvr.event_type, DATE_FORMAT( tpvr.visit_time , '%Y-%m-%d' )
         ) AS temp ON temp_date.date = temp.date and temp_date.type_id = temp.event_type
-        order by temp.date asc
+        order by temp_date.date asc
     </select>
 
     <select id="selectActiveUserCount" resultType="map">