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/service/HangzhouAqiService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/service/HangzhouAqiService.java b/src/main/java/com/moral/service/HangzhouAqiService.java
index 2138803..145b54e 100644
--- a/src/main/java/com/moral/service/HangzhouAqiService.java
+++ b/src/main/java/com/moral/service/HangzhouAqiService.java
@@ -10,5 +10,5 @@
* @Description: ������api������������
*/
public interface HangzhouAqiService {
- public List<Map> queryAqi24Hours(@NotNull Integer orgId);
+ public List<Map<String, Object>> queryAqi24Hours(@NotNull Integer orgId);
}
--
Gitblit v1.8.0