合併代碼

puzhibing

2024-10-12 0b5ae5d7b81ceeca9e05c29c853cd6a047a09a2b

 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;

}