Merge remote-tracking branch 'origin/master'

Administrator

2021-09-18 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944

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

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

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

   /**
    * 数量
    */
   private Integer num;

}