Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

Helius

2022-07-05 03123e40dfda2aca60201e026b40503a5c3ac892

 src/main/resources/mapper/ArticleMapper.xml

@@ -21,6 +21,9 @@
                <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>
            </if>
        </where>
        order by a.is_top desc,a.create_time desc