Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-01-15 68e7d31bc6d6c4a84ffb4b423c1ccd211f16f949

 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_id")
    private Integer goodId;
    @TableField("good_json")
    private String good_json;


}