Merge remote-tracking branch 'origin/master'

mitao

2024-06-13 464254ba0e542c22fac68c7512f06a9a8df34b28

 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;