Merge remote-tracking branch 'origin/master'

xiebin

2022-08-04 b7b04173afd9a05cedda9f44c53e52847806fb51

 src/main/java/org/springblade/modules/task/vo/TaskVO.java

@@ -35,4 +35,11 @@
   private String reaname;
   private String User;
   private int sta;

   private String year;

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