Merge remote-tracking branch 'origin/master'

luodangjia

2024-08-26 880c2a2bc0f60d0b2af43dad62f728f29fd5bf0a

 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;

}