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

935090232@qq.com

2021-01-17 29ba6fbd0015b9a77b5c994f43429a5a42e2ecc4

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

@@ -426,7 +426,7 @@
      if (!DataAuthUtil.hasAllShopAuth()) {
         vipInfoListDto.setShopId(sysUsers.getShopId());
      }
      QueryUtil.setQueryLimitCom(sysUsers.getCompanyId());
      QueryUtil.setQueryLimitCom(vipInfoListDto);
      return sysVipInfoDao.selectVipAddressBookByList(vipInfoListDto);
   }