Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

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

@@ -109,7 +109,7 @@

    @ApiModelProperty(value = "实名认证 0=不需实名 1=需要实名")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private AuthenticationEnum authentication;
    private Integer authentication;

    @ApiModelProperty("是否报名 1未报名，2 已报名")
    @JsonInclude(JsonInclude.Include.ALWAYS)
@@ -155,4 +155,5 @@
    @ApiModelProperty(value = "商品信息")
    List<getHomeGoodsSkuXxiVO> xxiVOS;


}