Merge remote-tracking branch 'origin/master'

tangzy

2022-07-16 dbbdbab62839ce6ba271d2144e37ab6b05f42c78

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

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

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