Merge branch 'ty_urgent' into api

Helius

2020-12-23 844e37605b65a2a3d95b466d663d91ac8584350c

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

@@ -206,4 +206,6 @@
   public List<SysVipInfo> selectVipInfoByVipNo(@Param("companyId") Long companyId, @Param("vipNo") String vipNo);

   List<VipInfoListVo> selectVipAddressBookByList(@Param("record") VipInfoListDto vipInfoListDto);

   com.matrix.system.app.vo.VipInfoVo selectVipInfoById(@Param("id") Long id);
}