Merge remote-tracking branch 'origin/master'

zengh

2021-08-27 8c28e0e9d71b84eb18a3b40a9afc46ab50269aa2

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

@@ -79,4 +79,10 @@
   @TableField("user_id")
   private Long userId;


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

}