Merge remote-tracking branch 'origin/master'

xiebin

2022-08-04 b7b04173afd9a05cedda9f44c53e52847806fb51

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

@@ -41,4 +41,13 @@
    * 农场id
    */
   private String farmId;

   /**
    * 肥料名称
    */
   private String agriculturalName;
   /**
    * 农资公司名称
    */
   private String factoryName;
}