Merge branch 'master' into xin

xin

4 days ago 982313135d1c239fe3b20e4c5664781f92d40aca

 oying-system/src/main/java/com/oying/modules/pc/product/view/ProductCustomerView.java

@@ -32,6 +32,12 @@
    @ApiModelProperty(value = "商品标题")
    private String title;

    @ApiModelProperty(value = "一级分类ID")
    private Long categoryId;

    @ApiModelProperty(value = "二级分类ID")
    private Long secondCategoryId;

    @ApiModelProperty(value = "状态")
    private Integer status;