From bd8b3f8e4b5d8af99f267eb5c6efaac03406c620 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 26 Sep 2023 20:03:01 +0800
Subject: [PATCH] Merge branch 'wb' into qa
---
screen-api/src/main/java/com/moral/api/pojo/form/historyFiveMinutely/QueryDeviceAndFiveMinuteDataForm.java | 4 ++++
1 files changed, 4 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 7e562fb..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)||
--
Gitblit v1.8.0