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

jyy

2021-01-16 9253517ff8a10e2df7924fdf6e0b737544d1a859

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

@@ -44,4 +44,9 @@
            </if>
        </if>
    </select>

    <delete id="deleteByVipId">
        delete from sys_vip_label
        where vip_id=#{vipId}
    </delete>
</mapper>