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

jyy

2021-04-07 2a4dc73c59eae1e14b0e0660bf04652fa3d322ad

 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);