Merge remote-tracking branch 'origin/master'

luodangjia

2024-09-11 71d710e252dccfaf35804c5d0e6a3f00dac9be2b

 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)