Merge branch 'score_shop'

wzy

2022-03-27 1f79de94f2fd5ff2b6de6556339aefd1c262dc40

Merge branch 'score_shop'

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