Merge remote-tracking branch 'origin/master'

jinpengyong

2020-06-03 4f3fd6c40cf8ff706f86363ccd6555164f348d63

 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);
}