From 5cc9058fb151d4285eb9d5e521060b57abf2d6c0 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Thu, 28 Jan 2021 15:07:18 +0800 Subject: [PATCH] Merge branch 'api' of https://gitee.com/jyyforjava/zq-erp into api --- zq-erp/src/main/java/com/matrix/system/hive/statistics/ServiceStatisticsAction.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/statistics/ServiceStatisticsAction.java b/zq-erp/src/main/java/com/matrix/system/hive/statistics/ServiceStatisticsAction.java index 532662d..81a5f11 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/statistics/ServiceStatisticsAction.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/statistics/ServiceStatisticsAction.java @@ -36,6 +36,7 @@ if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){ param.put("shopId",sysUsers.getShopId()); } + return AjaxResult.buildSuccessInstance(beauticianStateDao.selectItemDetail(param), beauticianStateDao.selectItemDetailTotal(param)); } -- Gitblit v1.9.1