Merge branch 'master' into feature/订单服务单代码改造

姜友瑶

2022-05-23 ea865027c9e115057644f59747f3bed2a8a963e6

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

@@ -25,11 +25,7 @@

   public int update(SysVipInfo sysVipInfo);

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

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

   public int deleteById(Long id);

   public List<SysVipInfo> selectInPage(@Param("record") SysVipInfo sysVipInfo, @Param("pageVo") PaginationVO pageVo);