Merge remote-tracking branch 'origin/master'

zengh

2022-07-13 3d4cbf0b3534da14db4a57f8bdafe2125b3b8678

 src/main/java/org/springblade/modules/traceability/vo/TraceabilityVO.java

@@ -12,4 +12,8 @@
public class TraceabilityVO extends Traceability {
   private static final long serialVersionUID = 1L;

   /**
    * 农场id
    */
   private String farmId;
}