Merge remote-tracking branch 'origin/master'

zengh

2021-08-15 0cab6d8afcc97e8bc94ef200e24d8839281f44c8

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

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

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



}