From 090f4dac98c412c5734a706b853724e2d2accda4 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 25 Oct 2023 15:17:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 screen-api/src/main/java/com/moral/api/pojo/vo/historyFiveMinutely/QueryFiveDataByMacVO.java |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 50 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/historyFiveMinutely/QueryFiveDataByMacVO.java b/screen-api/src/main/java/com/moral/api/pojo/vo/historyFiveMinutely/QueryFiveDataByMacVO.java
new file mode 100644
index 0000000..d9862c0
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/historyFiveMinutely/QueryFiveDataByMacVO.java
@@ -0,0 +1,50 @@
+package com.moral.api.pojo.vo.historyFiveMinutely;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="QueryFiveDataByMacVO - ���������������", description="QueryFiveDataByMacVO - ���������������")
+public class QueryFiveDataByMacVO implements Serializable{
+
+    @ApiModelProperty(value = "������������")
+    private String name;
+
+    @ApiModelProperty(value = "������")
+    private String  dataTime;
+
+    @ApiModelProperty(value = "pm25")
+    private String a34004;
+
+    @ApiModelProperty(value = "pm10")
+    private String a34002;
+
+    @ApiModelProperty(value = "������������")
+    private String a21026;
+
+    @ApiModelProperty(value = "������������")
+    private String a21004;
+
+    @ApiModelProperty(value = "������������")
+    private String a21005;
+
+    @ApiModelProperty(value = "������")
+    private String a05024;
+
+    @ApiModelProperty(value = "������")
+    private String a01008;
+
+    @ApiModelProperty(value = "������")
+    private String a01007;
+
+    @ApiModelProperty(value = "tvos")
+    private String a99054;
+}

--
Gitblit v1.8.0