From d48d6e9bb0bb48f8338798d8a2cba60396e16698 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 09 Jul 2022 09:52:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/farmplant/vo/FarmPlantVO.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/farmplant/vo/FarmPlantVO.java b/src/main/java/org/springblade/modules/farmplant/vo/FarmPlantVO.java
index d67586e..de03cf7 100644
--- a/src/main/java/org/springblade/modules/farmplant/vo/FarmPlantVO.java
+++ b/src/main/java/org/springblade/modules/farmplant/vo/FarmPlantVO.java
@@ -46,9 +46,14 @@
 	 * 结束时间
 	 */
 	private String endTime;
+	/**
+	 * 类型
+	 */
+	private String ty;
 
 	/**
 	 * 面积合计
 	 */
 	private Double areas;
+	private Integer fate;
 }

--
Gitblit v1.9.3