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

jinpengyong

2022-01-20 2ab1de34b119570c99946ab3e480e9d31745518a

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

@@ -13,6 +13,7 @@
 */
public interface HistoryMinutelyService {

    void insertHistoryMinutely(Map<String, Object> deviceData);
    //分钟数据insert
    void insertHistoryMinutely(Map<String, Object> data);

}