Merge remote-tracking branch 'origin/master'

jinpengyong

2020-05-21 a46f5f1db19dc1af644a4ed013bb12555621e135

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