罗元桥
2021-07-15 34fcf32a24d06befd53c6e05ae9c41a4de24e71b
Merge branch 'test' into 'master'

修改bug

See merge request root/zhihuishequ!99
1个文件已修改
3 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -841,9 +841,6 @@
            " AND e.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "UNION ALL SELECT " +
            " AND egd.grid_community_id = #{screenEventDTO.communityId}  " +
            " AND e.create_at >= DATE_SUB(CURDATE(),INTERVAL 30 DAY) UNION ALL " +
            "SELECT " +
            " IFNULL( NULL, 7 ) AS type, " +
            " id AS eventId, " +
            " lng_lat AS latLng  " +