Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-28 eb767fea1c9c55b66443758666cf6e987b706ff8

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TGrantVip.java

@@ -44,6 +44,6 @@
    @TableField("vip_id")
    private Integer vipId;
    @ApiModelProperty(value = "购买的会员id")
    @TableField("vip_id")
    @TableField("order_amount")
    private BigDecimal orderAmount;
}