Merge remote-tracking branch 'origin/huacheng_zts' into huacheng_zZ

张天森

2022-07-19 feb98a932adc9dab19fa538dbad743c63af0e621

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActAcidRecordDao.java

@@ -66,7 +66,7 @@
     * @param localCity
     * @return
     */
    FiveCount fiveCountPlus(@Param("date") String date,@Param("localCity") String localCity);
    FiveCount fiveCountPlus(@Param("date") String date,@Param("localCity") String localCity,@Param("type") Integer type);

    /**
     * 统计查询