Merge remote-tracking branch 'origin/master'

puzhibing

2024-09-12 87ca59fe207efa4bbd4029ca1d2ed38c11963682

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

@@ -36,6 +36,8 @@
    BigDecimal discountPrice;
    @ApiModelProperty(hidden =true)
    BigDecimal vipDiscount;
    @ApiModelProperty(hidden =true)
    String title;


}