fix conflict

Helius

2022-02-14 59cf24b0aba393e145f4ba3d58e98b7a01a80992

 zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipLabelDao.java

@@ -21,6 +21,8 @@

    int deleteById(@Param("id") Long id);

    int deleteByIds(@Param("list") List<Long> list);

    List<SysVipLabel> selectByVipId(@Param("vipId") Long vipId);

    List<SysVipLabel> selectByModel(@Param("record") SysVipLabel sysVipLabel);