Merge remote-tracking branch 'origin/qa' into qa

cjl

2023-10-10 495fad8166b5952c013aea275243cb9ee6e7fa2a

 screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml

@@ -11,4 +11,11 @@
                    <result column="batch" property="batch" />
        </resultMap>

    <select id="reList" resultType="com.moral.api.entity.HistorySecondUav">
        SELECT history_second_uav.time,`value`
        FROM history_second_uav WHERE mac = #{mac}
        AND batch = #{batch}
        HAVING abs(`value`->>'$.flyhig') <![CDATA[>=]]> #{height1}
        and  abs(`value`->>'$.flyhig') <![CDATA[<=]]> #{height2}
    </select>
</mapper>