Merge remote-tracking branch 'origin/master'

zhibing.pu

2024-09-05 7320cba2abc7beb1f990fb4fd52dc577b8d609dc

 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;

}