Merge remote-tracking branch 'origin/master'

zengh

2022-08-01 daa6dce26ec80c58a0013b73c44a409a96f4cfc7

 src/main/java/org/springblade/modules/traceability/entity/Traceability.java

@@ -87,7 +87,7 @@
   private Integer recoveryId;

   /**
    * 农场id
    * 单位id
    */
   private String deptId;