Merge remote-tracking branch 'origin/master'

xuhy

2024-09-13 cb02f43ad81fd2ce3e1c3e0cd95234746b7927ad

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

@@ -10,7 +10,7 @@
    @ApiModelProperty("商品id")
    Integer goodId;
    @ApiModelProperty("地址id")
    Integer addressId;
    Long addressId;
    @ApiModelProperty("备注")
    String remark;
    @ApiModelProperty(hidden = true)
@@ -36,6 +36,10 @@
    BigDecimal discountPrice;
    @ApiModelProperty(hidden =true)
    BigDecimal vipDiscount;
    @ApiModelProperty(hidden =true)
    String title;
    @ApiModelProperty(hidden =true)
    String phone;


}