From 3b29244703787dda85386167dca4126b5b0f150c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 16 Jul 2021 13:58:34 +0800
Subject: [PATCH] screen-api 添加查询五分钟数据接口以及查询国控站位置接口
---
screen-manage/src/main/java/com/moral/api/entity/DeviceAdjustValue.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/DeviceAdjustValue.java b/screen-manage/src/main/java/com/moral/api/entity/DeviceAdjustValue.java
index fd0b130..305ba7d 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/DeviceAdjustValue.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/DeviceAdjustValue.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.activerecord.Model;
import java.io.Serializable;
+import java.sql.Time;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -36,16 +37,14 @@
/**
* ������������
*/
- @DateTimeFormat(pattern = "HH:mm")
- @JsonFormat(pattern = "HH:mm",timezone = "GMT+8")
- private Date startTime;
+ @DateTimeFormat(pattern = "HH:mm:ss")
+ @JsonFormat(pattern = "HH:mm:ss",timezone = "GMT+8")
+ private Time startTime;
/**
* ������������
*/
- @DateTimeFormat(pattern = "HH:mm")
- @JsonFormat(pattern = "HH:mm",timezone = "GMT+8")
- private Date endTime;
+ private Time endTime;
/**
* ���������
--
Gitblit v1.8.0