Merge branch 'score_shop' into api_score_meger

jyy

2021-09-11 e1cc4a8ac8250d8f76d4d85f49b2b00a4047f0c9

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