Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-05-08 e53fcbe9fe844b7788b29c5106c1ac24d17c5535

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

@@ -189,7 +189,7 @@
   public int selectSecondTotalRecord(@Param("record") SysVipInfo sysVipInfo);


   public SysVipInfo selectByPhone(String phone);
   public SysVipInfo selectByPhone(@Param("phone") String phone,@Param("companyId") Long companyId);