Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2022-03-09 5fa4c1db3141099be4ca176cdf2f3ec10f46c141

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

@@ -20,4 +20,14 @@
        ORDER BY `time`
    </select>

    <select id="getCruiserData" resultType="java.util.Map">
        SELECT
        DATE_FORMAT(`time`, #{dateFormat}) AS `time`,
        `value`
        FROM `history_second_cruiser`
        WHERE mac = #{mac}
        AND `time` LIKE #{time}"%"
        AND organization_id = #{orgId}
    </select>

</mapper>