Merge remote-tracking branch 'origin/master'

xuhy

2024-10-26 54c15998e7c8464f61270e606ef39499c3a2b86b

 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;
}