Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1

mitao

2025-02-14 e097b03e9032a8e884c36e6a28d8b5002780daeb

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

@@ -123,6 +123,7 @@
    @ApiModelProperty(value = "规格单位")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String specUnit;

    @ApiModelProperty(value = "商品说明")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String detail;
@@ -142,5 +143,9 @@
    @ApiModelProperty(value = "商品信息")
    List<getHomeGoodsSkuXxiVO> xxiVOS;

    @ApiModelProperty("是否报名 1未报名，2 已报名")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Integer isApply;


}