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

jyy

2021-01-25 be98bd60f3332f4960d8a5a27778e2d6c2cdcb7f

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

@@ -742,7 +742,7 @@
              and  a.proj_name like concat('%',#{projName},'%')
            </if>
            <if test="cateId != null and cateId != ''  ">
                and  b.PROJ_TYPE_ID=#{cateId}
                and  b.cate_id=#{cateId}
            </if>
        </where>