Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

 src/main/resources/mapper/HistoryDailyMapper.xml

@@ -119,4 +119,12 @@
            </if>

        </where>

    </select>



    <!-- 根据设备mac地址，时间，污染因子查询一天的平均值 -->

    <select id="getDataByTimeSlot" resultType="java.util.Map">

        SELECT *

        FROM history_daily

        where mac=#{mac}

        AND time between #{startTime} and #{endTime}

    </select>

</mapper>