Merge branch 'test' into 'master'

罗元桥

2021-07-26 33b5b43bf58e9b8665b9e89c46e4ed0f7f4ad4a9

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoActivityDOMapper.xml

@@ -64,6 +64,8 @@
            and id != #{activityId}
        </if>

        and community_id = #{communityId}

    </select>

    <select id="pageActivityUser" parameterType="com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityUserDTO"