From 17cfbc75dc326f3e5963ee17c99d6516497f8cf1 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 26 Aug 2022 17:33:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/org/springblade/modules/panorama/entity/Panorama.java b/src/main/java/org/springblade/modules/panorama/entity/Panorama.java
index f9599a6..1d76741 100644
--- a/src/main/java/org/springblade/modules/panorama/entity/Panorama.java
+++ b/src/main/java/org/springblade/modules/panorama/entity/Panorama.java
@@ -40,6 +40,6 @@
 	private String jd;
 	private String wd;
 	private String addressName;
-
+	private int farmId;
 
 }

--
Gitblit v1.9.3