From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/mapper/HistoryDailyMapper.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/mapper/HistoryDailyMapper.java b/src/main/java/com/moral/mapper/HistoryDailyMapper.java
index 7a0c48f..c7122fd 100644
--- a/src/main/java/com/moral/mapper/HistoryDailyMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryDailyMapper.java
@@ -5,8 +5,11 @@
public interface HistoryDailyMapper {
- List<Map<String, Object>> getEmissionsData(Map<String, Object> parameters);
+ List<Map<String, Object>> getEmissionsData(Map<String, Object> parameters);
- List<Map<String, Object>> getOverproofData(Map<String, Object> parameters);
+ List<Map<String, Object>> getOverproofData(Map<String, Object> parameters);
+
+ // ���������������������������������������������
+ Map<String, Double> getTraceabilityData(Map<String, Object> parameters);
}
--
Gitblit v1.8.0