Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2024-01-31 3c0ccc88ffa8a651ec78a611ffe75775222ebf07

 screen-job/src/main/resources/mapper/DeviceMapper.xml

@@ -42,7 +42,7 @@
    cast( t1.`value` -> '$.a99054' AS DOUBLE ) AS a99054
    FROM
    device t
    LEFT JOIN history_minutely_202401 t1 ON t1.mac = t.mac
    LEFT JOIN history_minutely_${mon} t1 ON t1.mac = t.mac
    WHERE
    t.organization_id = #{id}
    AND date(t1.time) <![CDATA[=]]> #{startTime}