Merge remote-tracking branch 'origin/master'

luodangjia

2024-08-24 663fea0582f3b745f8feb93f3d6cd9515c580ff9

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/dto/ExchangeDto.java

@@ -3,6 +3,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

@Data
public class ExchangeDto {
    @ApiModelProperty("商品id")
@@ -26,5 +28,14 @@
    @ApiModelProperty("1微信2支付宝")
    Integer payMethod;

    @ApiModelProperty(hidden =true)
    BigDecimal orderPrice;
    @ApiModelProperty(hidden =true)
    BigDecimal payPrice;
    @ApiModelProperty(hidden =true)
    BigDecimal discountPrice;
    @ApiModelProperty(hidden =true)
    BigDecimal vipDiscount;


}