From e37630cbd344bd3e9b95964df31e7c23338c0924 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 01 Jul 2022 10:35:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java b/src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java
index b44ad9c..4a47038 100644
--- a/src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java
+++ b/src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java
@@ -17,4 +17,10 @@
 	 * 地块名称
 	 */
 	private String landName;
+
+	/**
+	 * 操作类型名称
+	 */
+	private String typeName;
+	private Integer snum;
 }

--
Gitblit v1.9.3