Merge remote-tracking branch 'origin/master'

tangzy

2021-11-25 a9ec32e3db22fa4f5f44fa2b68e92862c1f58a5d

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

@@ -79,6 +79,9 @@
   @TableField("user_id")
   private Long userId;


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

}