Merge branch 'local_20221104' into haucheng_panzhihua

yanghui

2022-12-13 2f36c29dadfeae2b813a6613d7f077b57b535c0e

Merge branch 'local_20221104' into haucheng_panzhihua

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

@@ -538,7 +538,7 @@
            AND p.sponsor_id = #{comActEasyPhotoVO.sponsorId}
        </if>
        <if test='comActEasyPhotoVO.sponsorId == null or comActEasyPhotoVO.sponsorId==0'>
            AND p.`status` in (2,5)
            AND p.`status` in (2,4,5)
            <if test="comActEasyPhotoVO.isFeedBackForDpc == null or comActEasyPhotoVO.isDpcMember == 0">
                AND p.is_publicity = 1
            </if>