Merge remote-tracking branch 'origin/master'

lizijie

2020-11-05 ff4135a758efe532ee5566fbdb6d9fee9e8410f8

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

@@ -5,7 +5,7 @@

public interface AlarmService {

    void insertAlarmDaily();
    int insertAlarmDaily();

    void createTable(String yearAndMonth);
}