From cd2cfd37366002f790a2ed1435962d4eff7d5cec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 01 Jun 2021 09:39:30 +0800
Subject: [PATCH] 版本合并

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/vo/HealthcodeVO.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/vo/HealthcodeVO.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/vo/HealthcodeVO.java
index d9c10f6..54c28ae 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/vo/HealthcodeVO.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/vo/HealthcodeVO.java
@@ -38,16 +38,21 @@
 	/**
 	 *开始时间
 	 */
-	private Date begTime;
+	private String begTime;
 
 	/**
 	 * 结束时间
 	 */
-	private Date endTime;
+	private String endTime;
 
 	/**
 	 * 状态  0： 当天时间统计数据     1： 本周内的数据统计
 	 */
 	private Integer status;
 
+	/**
+	 * 时间分布状态
+	 */
+	private String timeDesc;
+
 }

--
Gitblit v1.9.3