fix conflect

Helius

2022-07-05 b95699652357c6218b45eceb81170ddfebb30e1d

 src/main/resources/mapper/ArticleMapper.xml

@@ -21,8 +21,11 @@
                <if test="record.title!=null">
                    and a.title like concat ('%',#{record.title},'%')
                </if>
                <if test="record.contentType != null">
                    and a.content_type = #{record.contentType}
                <if test="record.columnIds != null">
                    and a.column_id =
                    <foreach collection="record.columnIds" separator="," close=")" open="(" item="item">
                        #{item}
                    </foreach>
                </if>
            </if>
        </where>