Merge branch 'score_shop' into api_score_meger

jyy

2021-07-16 2437327e2a9f89c6ee8c93e468939cf49ff8bd71

 zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java

@@ -237,9 +237,9 @@
    public @ResponseBody
    AjaxResult showList(PaginationVO pageVo, SysVipInfo vipInfo) {

//        if (!getMe().getShopRole().equals(Dictionary.FLAG_YES_Y)) {
        vipInfo.setShopId(getMe().getShopId());
//        }

        QueryUtil.setQueryLimit(vipInfo);

        return showList(vipInfoService, vipInfo, pageVo);
    }