Merge remote-tracking branch 'origin/master'

doum

5 天以前 2c1415e6c7bf6837cb24768770b10821853a6341

 server/dmmall_service/src/main/java/com/doumee/dao/business/model/ShopGoodsRelation.java

@@ -64,4 +64,9 @@
    @ExcelColumn(name="供货价")
    private BigDecimal price;

    @ApiModelProperty(value = "启用0 禁用1", example = "1")
    @ExcelColumn(name="启用0 禁用1")
    private Integer status;


}