From 67e2e142e752b724e021f3562c7f28e128e6f118 Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Tue, 16 Mar 2021 18:35:41 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop --- zq-erp/src/main/java/com/matrix/system/hiveErp/analysUtil/Caculate.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hiveErp/analysUtil/Caculate.java b/zq-erp/src/main/java/com/matrix/system/hiveErp/analysUtil/Caculate.java index 27e6cdf..193b9d0 100644 --- a/zq-erp/src/main/java/com/matrix/system/hiveErp/analysUtil/Caculate.java +++ b/zq-erp/src/main/java/com/matrix/system/hiveErp/analysUtil/Caculate.java @@ -5,6 +5,6 @@ /** * 明细数值计算器 */ -public interface Caculate { - public Map<String, Integer> exec(List<StatisticsTimeDaoParam> timeSpaceParam , Long shopId); +public interface Caculate<T> { + public Map<String, T> exec(List<StatisticsTimeDaoParam> timeSpaceParam , Long shopId, Long companyId); } -- Gitblit v1.9.1