Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-06 162fd6cf9cc47858c29d0b488bd7f018b77a56b4

 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 !='' ">