Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

 src/main/java/com/moral/common/util/ReportTimeFormat.java

@@ -121,7 +121,6 @@
         cal.set(toCalendarTimeUnit(timeUnits), value);
         return cal.getTime();
     }

     private static int toCalendarTimeUnit(TimeUnits timeUnits) {
           switch (timeUnits) {
               case YEAR: return  Calendar.YEAR;