Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-18 9d9832c4fc87f8da685f055da7ea7145879b4e0b

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/VipGood.java

@@ -34,8 +34,8 @@
    private Integer vipId;

    @ApiModelProperty(value = "指定购买后升级商品的json快照")
    @TableField("good_json")
    private String goodJson;
    @TableField("good_id")
    private Integer goodId;


}