Merge remote-tracking branch 'origin/master'

zengh

2022-07-19 ec09030f0730809145c97bfaa0bd0387a7d990bf

 src/main/java/org/springblade/modules/sale/vo/SaleVO.java

@@ -59,4 +59,13 @@
    * 种养时间
    */
   private String transplanTime;

   /**
    * 农场id
    */
   private String farmId;
   /**
    * 库存量主键id
    */
   private String proid;
}