From cf42a18aba4da77141dd0ea65918444636f899e1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 07 Dec 2020 10:50:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/entity/DeviceAndWind.java | 57 +++++++--------------------------------------------------
1 files changed, 7 insertions(+), 50 deletions(-)
diff --git a/src/main/java/com/moral/entity/DeviceAndWind.java b/src/main/java/com/moral/entity/DeviceAndWind.java
index 6abbfa3..7fd8fac 100644
--- a/src/main/java/com/moral/entity/DeviceAndWind.java
+++ b/src/main/java/com/moral/entity/DeviceAndWind.java
@@ -1,6 +1,11 @@
package com.moral.entity;
+import lombok.Data;
+
+import javax.persistence.Transient;
+@Data
public class DeviceAndWind {
+
private Double longitude;
private Double latitude;
@@ -11,54 +16,6 @@
private Double tVoc;
- public Double gettVoc() {
- return tVoc;
- }
-
- public void settVoc(Double tVoc) {
- this.tVoc = tVoc;
- }
-
- public Double getLongitude() {
- return longitude;
- }
-
- public void setLongitude(Double longitude) {
- this.longitude = longitude;
- }
-
- public Double getLatitude() {
- return latitude;
- }
-
- public void setLatitude(Double latitude) {
- this.latitude = latitude;
- }
-
- public Double getWindDir() {
- return windDir;
- }
-
- public void setWindDir(Double windDir) {
- this.windDir = windDir;
- }
-
- public Double getWindSpeed() {
- return windSpeed;
- }
-
- public void setWindSpeed(Double windSpeed) {
- this.windSpeed = windSpeed;
- }
-
- @Override
- public String toString() {
- return "DeviceAndWind{" +
- "longitude=" + longitude +
- ", latitude=" + latitude +
- ", windDir=" + windDir +
- ", windSpeed=" + windSpeed +
- ", tVoc=" + tVoc +
- '}';
- }
+ @Transient
+ private JwtTokenVersion jwtTokenVersion;
}
--
Gitblit v1.8.0