Merge remote-tracking branch 'origin/master'

lizijie

2020-11-05 ff4135a758efe532ee5566fbdb6d9fee9e8410f8

 src/main/java/com/moral/service/HistoryService.java

@@ -10,4 +10,8 @@
    List<History> selectByMacAndTime(Map<String, Object> parameters);

    int insertHistorySpecialTable(Map<String, Object> parameters);

    int deleteHistoryData(String oldTime);

    void deletePartition(String p);
}