Merge remote-tracking branch 'origin/master'

zengh

2022-08-01 daa6dce26ec80c58a0013b73c44a409a96f4cfc7

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

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

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

}