From 54c0125835e850b97793601ac45ee62fa1c4b12e Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 27 Oct 2023 09:36:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml b/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml
index 61ab41c..fbb6c7e 100644
--- a/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -38,7 +38,7 @@
<select id="getArea" 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