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

jinpengyong

2021-06-23 df2f2b669f4196f599ca4db91917314ddc4ed94f

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

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

    void insertHistoryMinutely(Map<String, Object> deviceData);
    void insertHistoryMinutely(Map<String, Object> data);

}