Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-12-23 e745dd38c5a413eaa000c7c5434621fbcd1800d5

 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;