Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-20 f50e081f650eb067cce44fce3db64a237fde145b

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