Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-12-23 e745dd38c5a413eaa000c7c5434621fbcd1800d5

 src/main/resources/mapper/ForecastWeatherMapper.xml

@@ -7,7 +7,7 @@
    <select id="getForecastHour" resultType="java.util.Map">
        SELECT
        DATE_FORMAT(time, #{typeFormat}) time,
        json->'$.O3C' 'O3'
        json->'$.${sensor1}' '${sensor2}'
        from forecast_weather
        where time >= #{start}
        AND time <![CDATA[<]]> #{end}