From 6d7633051dc592f80b7967e34fa6e34f340f899d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 18 Jul 2022 15:16:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/farm/entity/FarmingRecord.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/farm/entity/FarmingRecord.java b/src/main/java/org/springblade/modules/farm/entity/FarmingRecord.java
index b0d64af..6286a03 100644
--- a/src/main/java/org/springblade/modules/farm/entity/FarmingRecord.java
+++ b/src/main/java/org/springblade/modules/farm/entity/FarmingRecord.java
@@ -94,5 +94,7 @@
 	 * 租户id
 	 */
 	private String tenantId;
+	private String content;
+	private Double census;
 
 }

--
Gitblit v1.9.3