Merge branch 'master' of http://xufenglei@blit.7drlb.com:8888/r/screen_api_...

xufenglei

2019-06-17 dbed3099ea0dd2a517b739f29943d4ee529760e6

 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;