Merge remote-tracking branch 'origin/master'

zengh

2022-07-13 3d4cbf0b3534da14db4a57f8bdafe2125b3b8678

 src/main/java/org/springblade/modules/farmplant/vo/FarmPlantVO.java

@@ -61,4 +61,9 @@
    * 大屏年月日查询
    */
   private String year;

   /**
    * 农场id
    */
   private String farmId;
}