Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-08 66794a3e6b3feb01d4b6ae5710a0725b525a99dd

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TActivityVO.java

@@ -23,5 +23,4 @@
    private BigDecimal vipActivity;
    @ApiModelProperty(value = "赠送会员")
    private BigDecimal grantVip;

}