Merge remote-tracking branch 'origin/master'

tangzy

2022-07-18 6d7633051dc592f80b7967e34fa6e34f340f899d

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

@@ -32,6 +32,10 @@
    * 结束时间
    */
   private String endTime;

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

}