From 6fe3e9841f25481cf78bd1f102886d4ce35e9e17 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 28 Jul 2023 13:38:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into qa

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

diff --git a/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml b/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml
index 8756866..cda70d3 100644
--- a/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml
@@ -12,7 +12,7 @@
         </resultMap>
 
     <select id="reList" resultType="com.moral.api.entity.HistorySecondUav">
-        SELECT `value`
+        SELECT history_second_uav.time,`value`
         FROM history_second_uav WHERE mac = #{mac}
         AND batch = #{batch}
         HAVING abs(`value`->>'$.flyhig') <![CDATA[>=]]> #{height}

--
Gitblit v1.8.0