Merge remote-tracking branch 'origin/master'

无关风月

5 天以前 72faad1ea54670b640c172e3f7efe49f698cf420

 manage/src/main/java/com/jilongda/manage/model/TFrameGoods.java

@@ -39,5 +39,7 @@
    @ApiModelProperty(value = "门店id")
    @TableField("storeId")
    private Integer storeId;

    @ApiModelProperty(value = "1启用2禁用")
    @TableField("status")
    private Integer status;
}