Merge remote-tracking branch 'origin/master'

fengxiang

2018-09-20 a31c81dada74c63ff96c7adf7f21451f1e3ad989

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

@@ -1,5 +1,5 @@
package com.moral.entity.charts;

public enum  TimeUnits {
    YEAR,MONTH,DAY,HOUR,MINUTE
    YEAR,MONTH,DAY,HOUR,MINUTE,SECOND,MILLISECOND
}