From 5c1d58556e9cd4c7603b5e16dc1640f61623af0b Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 08 Nov 2023 11:47:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-api/src/main/java/com/moral/api/pojo/form/historyFiveMinutely/QueryDeviceAndFiveMinuteDataForm.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/form/historyFiveMinutely/QueryDeviceAndFiveMinuteDataForm.java b/screen-api/src/main/java/com/moral/api/pojo/form/historyFiveMinutely/QueryDeviceAndFiveMinuteDataForm.java
index 6ca5be0..f66ea8b 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/form/historyFiveMinutely/QueryDeviceAndFiveMinuteDataForm.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/form/historyFiveMinutely/QueryDeviceAndFiveMinuteDataForm.java
@@ -19,6 +19,10 @@
private String sensorCode;
+ private String chooseTime;
+
+ private String time;
+
public boolean valid(){
if(ObjectUtils.isEmpty(organizationId)||
ObjectUtils.isEmpty(regionCode)||
@@ -26,4 +30,6 @@
return false;
return true;
}
+
+
}
--
Gitblit v1.8.0