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

jyy

2021-01-16 9253517ff8a10e2df7924fdf6e0b737544d1a859

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

 zq-erp/src/main/java/com/matrix/system/app/dto/VipInfoListDto.java

@@ -31,6 +31,17 @@
    @ApiModelProperty(hidden = true)
    private Long shopId;

    @ApiModelProperty(hidden = true)
    private Long companyId;

    public Long getCompanyId() {
        return companyId;
    }

    public void setCompanyId(Long companyId) {
        this.companyId = companyId;
    }

    public String getQueryKey() {
        return queryKey;
    }

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