Merge remote-tracking branch 'origin/dev' into dev

101captain

2022-03-16 921b1ac853190e64b7e8005e2598c9aa92114f91

Merge remote-tracking branch 'origin/dev' into dev

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

@@ -192,7 +192,7 @@
        <if test="!isResidentAct">
            AND `type` = 1
        </if>
        AND DATE_FORMAT( publish_at, '%Y-%m' ) &lt;= #{date}
        AND DATE_FORMAT( create_at, '%Y-%m' ) &lt;= #{date}
    </select>
    <select id="indexActList" resultType="com.panzhihua.common.model.vos.community.ComActActivityVO">
        SELECT id, `status`, activity_type, activity_name, cover