Merge remote-tracking branch 'origin/master'

Administrator

2021-09-18 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944

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

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


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

}