Merge branch 'developer' into alpha

姜友瑶

2022-05-17 206b2a8034f066f7f4d08755abfee3f5049d0632

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

@@ -25,6 +25,8 @@

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