Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/PromotionWishListDTO.java

@@ -24,7 +24,7 @@
    private BigDecimal expectedPrice;

    @ApiModelProperty(value = "商品图片")
    private MultipartFile[]  goodsImageUrl;
    private String  goodsImageUrl;

    @ApiModelProperty(value = "备注")
    private String remark;