Merge branch 'score_shop'

Helius

2022-10-19 39a5520c112081aff9f55ad13c1b4b53e4136a87

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

@@ -218,6 +218,7 @@
        if (!DataAuthUtil.hasAllShopAuth()) {
            sysOrder.setShopId(getMe().getShopId());
        }
        sysOrder.setCompanyId(getMe().getCompanyId());
        return new AjaxResult(AjaxResult.STATUS_SUCCESS, orderService.findInPage(sysOrder, pageVo),
                orderService.findTotal(sysOrder));
    }