Merge remote-tracking branch 'origin/master'

zengh

2022-08-01 daa6dce26ec80c58a0013b73c44a409a96f4cfc7

 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;

}