Merge branch 'api' into order_reform

Helius

2021-01-12 a88cf964159303c208d8a3a9d0b8dadef7b1388a

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