From daa6dce26ec80c58a0013b73c44a409a96f4cfc7 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 01 Aug 2022 10:36:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/task/vo/TaskVO.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/task/vo/TaskVO.java b/src/main/java/org/springblade/modules/task/vo/TaskVO.java
index 3cbabbd..0461185 100644
--- a/src/main/java/org/springblade/modules/task/vo/TaskVO.java
+++ b/src/main/java/org/springblade/modules/task/vo/TaskVO.java
@@ -33,4 +33,13 @@
 	private String landname;
 	private String argname;
 	private String reaname;
+	private String User;
+	private int sta;
+
+	private String year;
+
+	/**
+	 * 农场id
+	 */
+	private String farmId;
 }

--
Gitblit v1.9.3