Merge branch 'master' into xin

xin

5 days ago 8a7f9301f4b9e6fcd4e1b3014fb8c5d52820e179

 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;