Merge remote-tracking branch 'origin/test' into test

manailin

2021-06-30 cf2e6ce54f82c61606a01f816f7cac8b3a967809

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

@@ -84,6 +84,9 @@
            "<if test='neighborCircleAdminDTO.startAt != null and neighborCircleAdminDTO.endAt !=null '>" +
            "and nc.create_at between #{neighborCircleAdminDTO.startAt} and #{neighborCircleAdminDTO.endAt}  \n" +
            " </if> " +
            "<if test='neighborCircleAdminDTO.status != null '>" +
            "and nc.status = #{neighborCircleAdminDTO.status}  \n" +
            " </if> " +
            "</where>"+
            "order by " +
            "case when nc.`status`=1 then 0 else 1 end, \n" +