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

jyy

2021-03-12 b12efd16399d217756bf71b92d88b29bd4781295

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

@@ -44,11 +44,9 @@
    public AjaxResult findStoreList(@RequestBody @Validated StoreListDto storeListDto) {
        SysStoreInfo sysStoreInfo = new SysStoreInfo();

        if (!DataAuthUtil.hasAllShopAuth()) {
            SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
            sysStoreInfo.setShopId(users.getShopId());
            sysStoreInfo.setCompanyId(users.getCompanyId());
        }
        SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        sysStoreInfo.setShopId(users.getShopId());
        sysStoreInfo.setCompanyId(users.getCompanyId());
        sysStoreInfo.setQueryKey(storeListDto.getQueryKey());
        PaginationVO pageVo = new PaginationVO();
        pageVo.setOffset((storeListDto.getPageNum() - 1) * storeListDto.getPageSize());