Merge remote-tracking branch 'origin/master'

zengh

2021-08-19 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf

 src/main/java/org/springblade/modules/equipage/entity/Equipage.java

@@ -73,6 +73,10 @@
   @DateTimeFormat(pattern = "yyyy-MM-dd")
   private Date dateForProduction;


   /**
    * 责任人id
    */
   @TableField("user_id")
   private Long userId;

}