Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

kaiyu

2020-09-22 30d07fbe902f3013a65a7c00fa141b119610a8f7

 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;