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

xufenglei

2019-06-17 dbed3099ea0dd2a517b739f29943d4ee529760e6

 src/main/java/com/moral/entity/charts/TimePeriod.java

@@ -6,6 +6,9 @@

@Data
public class TimePeriod {
       public TimePeriod(){

       }
       public TimePeriod (Date startTime,Date endTime,TimeUnits timeUnits)
       {
              this.startTime = startTime;