Merge remote-tracking branch 'origin/master'

fengxiang

2018-09-20 a31c81dada74c63ff96c7adf7f21451f1e3ad989

 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;