From 30f3c72b0b25ab0aaeb9dd5d9918de3b123ce5e6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 08 Apr 2021 16:34:58 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
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