Merge branch 'master' of http://sinata.cn:10101/gitblit/r/java/HongRuiTang

zhanglin8526

2023-05-10 39748c770c83ff1b1e4593c5f24b147361e587c0

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerConsumerGoodsListVo.java

@@ -28,6 +28,9 @@
    @ApiModelProperty("商品名称")
    private String goodsName;

    @ApiModelProperty(value = "商品简介")
    private String goodsIntroduction;

    @ApiModelProperty("商品图片")
    private String goodsPicture;