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

jinpengyong

2021-11-02 6cc2a1d726e1019079b6d3fa74599426a359c001

 screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java

@@ -60,6 +60,7 @@
            * @Author: 陈凯裕
            * @Date: 2021/9/23
            */
    @Override
    public List<HistoryHourly> getValueByMacAndTime(String mac,Date startDate,Date endDate){
        QueryWrapper<HistoryHourly> wrapper = new QueryWrapper<>();
        wrapper.eq("mac",mac);