Merge remote-tracking branch 'origin/master'

zengh

2022-07-13 3d4cbf0b3534da14db4a57f8bdafe2125b3b8678

 src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java

@@ -36,4 +36,9 @@
    * 品种名称
    */
   private String strainName;

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