Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-03-25 5857fd14f4608ace25724ba6386d72d210e20870

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