Merge remote-tracking branch 'origin/master'

guoshilong

2022-08-26 17cfbc75dc326f3e5963ee17c99d6516497f8cf1

 src/main/java/org/springblade/modules/processInv/entity/ProcessInv.java

@@ -49,8 +49,8 @@
   */
   private Double productInventoryNum;
   /**
    * 农场id
    * 农产品库存id主键
    */
   private String farmId;
   private String fpsId;

}