Merge branch 'score_shop' into api_score_meger

jyy

2021-09-14 d139016c6abfb03d2cbd5ade3d1fec84d5757deb

 zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java

@@ -75,11 +75,11 @@
            vipInfoListDto.setOrder("asc");
        }


        int offset = (vipInfoListDto.getPageNum() - 1) * vipInfoListDto.getPageSize();
        int limit = vipInfoListDto.getPageSize();
        vipInfoListDto.setOffset(offset);
        vipInfoListDto.setLimit(limit);