From 2a4a9ef52b0d76efb9712fd8d4268f658546f99f Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 19 Oct 2023 16:31:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
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