Merge remote-tracking branch 'origin/master'

guoshilong

2022-08-26 17cfbc75dc326f3e5963ee17c99d6516497f8cf1

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

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

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

}