Merge branch 'api' into hive2.0

jyy

2021-01-25 949efdc17fa833f6511c0e5902057f3be0fe72c4

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

@@ -16,7 +16,7 @@
            user_id,
            color
        ) values (
            #{createTime},
            now(),
            #{createBy},
            #{id},
            #{label},