~jiangyouyao/beauty-erp.git

			@@ -440,7 +440,8 @@

			<select id="selectApiArticleListInPage" resultMap="ArticleMap">
			select * from article a
			inner join article_type b on a.type_id=b.id and find_in_set(#{record.typeId}, b.parent_ids)
			inner join article_type b on a.type_id=b.id
			where a.type_id=#{record.typeId} or find_in_set(#{record.typeId}, b.parent_ids)
			order by a.createtiem desc
			<if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->
			<if test="pageVo.offset >=0 and pageVo.limit >0">