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/TimePeriod.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/entity/charts/TimePeriod.java b/src/main/java/com/moral/entity/charts/TimePeriod.java
index 44c0a8f..33e3f3e 100644
--- a/src/main/java/com/moral/entity/charts/TimePeriod.java
+++ b/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;
--
Gitblit v1.8.0