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

jyy

2021-04-20 f50e081f650eb067cce44fce3db64a237fde145b

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java

@@ -116,7 +116,7 @@
         }
         if (serviceUtil.addCheckRepeatTowColumn(TableMapping.SYS_VIP_INFO, "PHONE", sysVipInfo.getPhone(),
               "company_id",sysVipInfo.getCompanyId() )) {
            throw new GlobleException("手机已被注册!");
            throw new GlobleException(sysVipInfo.getPhone()+"手机已被注册!");
         }
      }

@@ -400,7 +400,7 @@
               SysVipInfo vipInfo = new SysVipInfo();
               vipInfo.setVipNo(objects.get(0).toString());

               SysVipInfo exist = sysVipInfoDao.selectByPhone(objects.get(3).toString());
               SysVipInfo exist = sysVipInfoDao.selectByPhone(objects.get(3).toString(),sysUsers.getCompanyId());
               if (exist != null) {
                  continue;
               }