Merge remote-tracking branch 'origin/master'

mitao

2024-06-18 fd97cde3d994a3aa6898ba862cd20d0c081012c3

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java

@@ -53,11 +53,16 @@

    @ApiModelProperty(value = "商品说明")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String explain;

    @ApiModelProperty(value = "商品介绍")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String detail;

    @ApiModelProperty(value = "商品年份")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String years;
    private LocalDateTime years;

    @ApiModelProperty(value = "商品分类")
    @JsonInclude(JsonInclude.Include.ALWAYS)
@@ -128,4 +133,16 @@
    @ApiModelProperty(value = "分享图片")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String sharePic;

    @ApiModelProperty(value = "订单id")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Long orderId;

    @ApiModelProperty(value = "订单编号")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String orderNo;

    @ApiModelProperty(value = "保证金")
    private BigDecimal bond;

}