From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/entity/charts/TimeUnits.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/entity/charts/TimeUnits.java b/src/main/java/com/moral/entity/charts/TimeUnits.java
index 92ed288..209a991 100644
--- a/src/main/java/com/moral/entity/charts/TimeUnits.java
+++ b/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
}
--
Gitblit v1.8.0