Merge branch 'local_20221014' into huacheng_test

yanghui

2022-10-20 363579d4cb729941cb779ebf6e233e0b6e74b49d

Merge branch 'local_20221014' into huacheng_test

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

@@ -48,7 +48,7 @@
        left join com_act_neighbor_circle_topic as canct on canct.id = canc.topic_id
        left join com_act as ca on ca.community_id = canc.community_id
        where is_del = 2 and canc.status = 2
        and nc.community_id in
        and canc.community_id in
        <foreach collection="neighborCircleAppDTO.communityIds" item="item" index="index" open="(" separator="," close=")">
            ${item}
        </foreach>