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

kaiyu

2021-10-18 5586964c3e63f95c9e460a6a3d85d7dca408e096

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

@@ -54,7 +54,7 @@
        String yearAndMonth = DateUtils.dateToDateString(time, DateUtils.yyyyMM_EN);

        result.put("mac", mac);
        result.put("time", time);
        result.put("time", DateUtils.addHours(time, -1));
        result.put("version", version);
        result.put("timeUnits", yearAndMonth + "_" + Constants.UN_ADJUST);
        result.put("value", JSONObject.toJSONString(data));