From 495fad8166b5952c013aea275243cb9ee6e7fa2a Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 10 Oct 2023 13:43:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into qa

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

diff --git a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
index f69bdb2..1b61bbb 100644
--- a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
@@ -50,8 +50,8 @@
           AND `time` <![CDATA[<=]]> #{time2}
     </select>
 
-    <select id="getDust" resultType="java.lang.Double">
-        select JSON_EXTRACT(value,'$.dustld')
+    <select id="getDust" resultType="java.lang.String">
+        select value ->>'$.dustld'
         from `history_second_cruiser`
         WHERE mac = #{mac}
           AND `time` <![CDATA[>=]]> #{start}

--
Gitblit v1.8.0