Merge branch 'test' into 'master'

罗元桥

2021-06-29 cd7bec2448443f88eee6f73df68df829fc95eed9

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

@@ -94,6 +94,9 @@
            "<if test='comActDynVO.status != null '>" +
            "AND d.`status` = #{comActDynVO.status}  " +
            " </if> " +
            "<if test='comActDynVO.type != null '>" +
            "AND d.type = #{comActDynVO.type}  " +
            " </if> " +
            "<if test='comActDynVO.publishAtBegin != null '>" +
            "AND d.publish_at BETWEEN #{comActDynVO.publishAtBegin}  " +
            "AND #{comActDynVO.publishAtEnd}" +