From 95e25505521e3a2170f5867c211bf784f1032eba Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 22 Mar 2021 20:16:50 +0800 Subject: [PATCH] Merge branch 'api' into hive2.0 --- 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