From d95f6551e8214d69cd0fd511ec693641eb61ba16 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 01 Aug 2022 10:36:26 +0800
Subject: [PATCH] 1、大屏首页接口修复，解决double类型相加精度问题

---
 src/main/java/org/springblade/modules/farm/entity/Farm.java |   38 ++++++++++++++++++++++++++++++++------
 1 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/farm/entity/Farm.java b/src/main/java/org/springblade/modules/farm/entity/Farm.java
index dbb0e48..3ddde20 100644
--- a/src/main/java/org/springblade/modules/farm/entity/Farm.java
+++ b/src/main/java/org/springblade/modules/farm/entity/Farm.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springblade.core.tenant.mp.TenantEntity;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.io.Serializable;
 import java.util.Date;
@@ -29,7 +30,7 @@
 	/**
 	 * 农场名称
 	 */
-	private Integer farmName;
+	private String farmName;
 
 	/**
 	 * 农场地址
@@ -65,16 +66,41 @@
 	private String position;
 
 	/**
-	 * 租户id
-	 */
-	private String tenantId;
-
-	/**
 	 * 创建时间
 	 */
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date createTime;
 
+	/**
+	 * 更新时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date updateTime;
 
+	/**
+	 * 公司id
+	 */
+	private String deptId;
+
+	/**
+	 * 省编号
+	 */
+	private String province;
+
+	/**
+	 * 市编号
+	 */
+	private String city;
+
+	/**
+	 * 区编号
+	 */
+	private String district;
+
+	/**
+	 * 360全景url
+	 */
+	private String panoramic;
 }

--
Gitblit v1.9.3