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

xiaoyong931011

2022-06-24 8ef3693f9a10ebdb2f54a61bd81a2c600c3d8813

 src/main/resources/mapper/ArticleMapper.xml

@@ -15,6 +15,9 @@
                <if test="record.columnId != null">
                    and a.column_id = #{record.columnId}
                </if>
                <if test="record.companyId != null">
                    and a.company_id = #{record.companyId}
                </if>
                <if test="record.title!=null">
                    and a.title like concat ('%',#{record.title},'%')
                </if>