Merge branch 'api' into hive2.0

935090232@qq.com

2021-01-26 d622f4d59d6b9e03271b3f4774bffedb3b8a3078

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

@@ -293,7 +293,8 @@

   @Override
   public List<SysVipInfo> findUserByKey(String keyWord) {
      return sysVipInfoDao.selectUserByKey(keyWord);
      SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
      return sysVipInfoDao.selectUserByKey(keyWord,user.getCompanyId());
   }