Merge branch 'test' into 'master'

罗元桥

2021-07-26 33b5b43bf58e9b8665b9e89c46e4ed0f7f4ad4a9

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

@@ -35,7 +35,7 @@
     * @param endTime   活动结束时间
     * @return  返回冲突的活动数量
     */
    Integer getEasyPhotoActivityTimeConflict(@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("activityId") Long activityId);
    Integer getEasyPhotoActivityTimeConflict(@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("activityId") Long activityId,@Param("communityId") Long communityId);

    /**
     * 分页查询随手拍活动下居民参与记录