Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-16 cd264145f9b4107f1430da46269dd306d26f3116

 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;