Merge branch 'test_screen' into 'master'

罗元桥

2021-06-16 e67f030eff4d90e85adc4618ec4debc9d195541e

Merge branch 'test_screen' into 'master'

Test screen

See merge request root/zhihuishequ!59

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

@@ -274,7 +274,7 @@
    List<IndexPopulationSexStatisticsVO> getScreenIndexByPopulationSex(@Param("communityId") Long communityId);

    @Select("SELECT " +
            " e.create_at, " +
            " e.happen_time as createAt, " +
            " e.event_des, " +
            " e.event_deal_status  " +
            "FROM " +
@@ -586,7 +586,7 @@
    @Select("SELECT " +
            " su.nick_name AS userName, " +
            " su.image_url AS imageUrl, " +
            " e.create_at, " +
            " e.happen_time as createAt, " +
            " e.event_des, " +
            " e.danger_level, " +
            " e.urgent, " +
@@ -606,7 +606,7 @@
            " AND e.event_deal_status = 1  " +
            " AND e.event_category = 1  " +
            "ORDER BY " +
            " e.create_at DESC  " +
            " e.happen_time DESC  " +
            " LIMIT 1")
    EventNewStatisticsVO getEventScreenRightTop(@Param("communityId") Long communityId);