From a9cc2343ceaad3e99dc25eb036dc99aeded279a6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 20 Oct 2023 09:26:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

---
 screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml b/screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml
index 360ff73..ffb0a1b 100644
--- a/screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml
@@ -6,7 +6,7 @@
     <select id="getAreaWindData" resultType="com.moral.api.pojo.dto.Wind.WindData">
         SELECT
         d.longitude AS longitude,
-        d.latitude AS latitude,
+        d.latitude AS latitude,d.mac,
         CASE WHEN
         h.value->'$.a01007' = 0 THEN 0.1 ELSE h.value->'$.a01007' END AS windSpeed,
         h.value->'$.a01008' AS windDir

--
Gitblit v1.8.0