Merge branch 'api' into hive2.0

jyy

2021-01-26 ec0c71cc88407098e0c088dbf1e44cddf856b8f8

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

@@ -232,7 +232,7 @@
         <if test="record.articleTypeName != null and record.articleTypeName !='' ">
            and article_type_name = #{record.articleTypeName}
         </if>
         <if test="record.parentId != null and record.parentId !='' ">
         <if test="record.parentId != null or record.parentId ==0 ">
            and parent_id = #{record.parentId}
         </if>
         <if test="record.sort != null and record.sort !='' ">