Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-07-15 269985404f94b50d14099b83f3436d6d405c365d

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

@@ -147,7 +147,6 @@
        if (StringUtils.isBlank(pageVo.getOrder())) {
            pageVo.setOrder("desc");
        }
        projService.setShopId(getMe().getShopId());
        List<SysProjServices> dataList = projServicesSerivce.findInPage(projService, pageVo);
        AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, dataList, projServicesSerivce.findTotal(projService));
        return result;