解决冲突

jiangping

2023-09-14 31c9104b7e4f963110ee581ac05a3a5addc109f5

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

@@ -91,6 +91,12 @@
    @ApiModelProperty(value = "企业编码")
    @ExcelColumn(name="企业编码")
    private Integer companyId;
    @ApiModelProperty(value = "平台分类编码")
    @ExcelColumn(name="平台分类编码")
    private Integer platCateId;
    @ApiModelProperty(value = "类型 0自建 1平台关联")
    @ExcelColumn(name="类型")
    private Integer type;


    @ApiModelProperty(value = "参数名称 列表值")