Merge branch 'score_shop' into api_score_meger

jyy

2021-08-09 38ab27c64d593d7b69a0d60eeafde32a9f14395e

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

@@ -429,8 +429,9 @@

   @Override
   public List<VipInfoListVo> findVipAddressBook(VipInfoListDto vipInfoListDto) {
      //todo 会员查询单独做控制
      SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
      if (!DataAuthUtil.hasAllShopAuth()) {
      if (!DataAuthUtil.hasAllCustomerAuth()) {
         vipInfoListDto.setShopId(sysUsers.getShopId());
      }
      QueryUtil.setQueryLimitCom(vipInfoListDto);