Merge remote-tracking branch 'origin/master'

doum

9 天以前 3c5771460c280139a53e0c451e6ceb8742680b5c

 server/services/src/main/java/com/doumee/dao/business/model/Category.java

@@ -24,6 +24,7 @@
@TableName("`category`")
public class Category {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
    @ExcelColumn(name="主键")
    private Integer id;