Merge remote-tracking branch 'origin/master'

guoshilong

2022-08-12 be9da335cb28e12e1439c24e4596f069e342d83f

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

@@ -38,4 +38,9 @@
    */
   private String farmId;

   /**
    * 品种类型(0种植 1水产 2畜牧)
    */
   private String strainType;

}