Merge remote-tracking branch 'origin/master'

xuhy

2024-09-02 3b0a898df3cafe2c876d20b5bf9dd0f1734acc81

 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;

}