Merge remote-tracking branch 'origin/hive2.0' into hive2.0

jyy

2021-01-25 4d4805096b898a6e99f31794facb81794bd1fcf7

 zq-erp/src/main/resources/mybatis/mapper/hive/ArticleDao.xml

@@ -437,4 +437,17 @@
      </if>
      order by type_id,sort,createtiem desc
   </select>

   <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)
      order by a.createtiem desc
      <if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->
         <if test="pageVo.offset >=0  and pageVo.limit >0">
            limit
            #{pageVo.offset},#{pageVo.limit}
         </if>
      </if>
   </select>

</mapper>