Merge branch 'v3.5.1' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3.5.1

src/main/resources/mapper/statistic/TsCustomerStatisticDailyMapper.xml

@@ -58,5 +58,6 @@
         AND customer_type = #{customerType}
         AND date_format( create_date, '%Y-%m-%d' ) >= date_format( #{beforeDate}, '%Y-%m-%d' )
         AND date_format( create_date, '%Y-%m-%d' ) <= date_format( #{nowDate}, '%Y-%m-%d' )
+        order by `day`
     </select>
 </mapper>

src/main/resources/mapper/statistic/TsCustomerStatisticMonthlyMapper.xml

@@ -54,5 +54,6 @@
         AND customer_type = #{customerType}
         AND date_format( create_date, '%Y-%m-%d' ) >= date_format( #{beforeDate}, '%Y-%m-%d' )
         AND date_format( create_date, '%Y-%m-%d' ) <= date_format( #{nowDate}, '%Y-%m-%d' )
+         order by `month`
     </select>
 </mapper>