Merge branch 'master' into xin

xin

2025-07-19 8841ef182bbe06a7ef1f102f51810502dde0a76f

 oying-system/src/main/java/com/oying/modules/pc/product/domain/Product.java

@@ -58,6 +58,9 @@
    @ApiModelProperty(value = "状态")
    private Integer status;

    @ApiModelProperty(value = "上架状态")
    private Integer shelfStatus;

    @NotBlank
    @ApiModelProperty(value = "主图片")
    private String mainImageId;