Merge remote-tracking branch 'origin/master'

lizijie

2020-11-05 ff4135a758efe532ee5566fbdb6d9fee9e8410f8

 src/main/java/com/moral/mapper/HistoryMapper.java

@@ -32,4 +32,5 @@
    int deleteHistoryData(String oldTime);



    void deletePartition(@Param("p") String p);



}