Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-09-21 2193f1e8240e2a0ed5900dddc6347a1d9db081cf

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

@@ -103,11 +103,11 @@
    @TableField(exist = false)
    private List<CateParam> paramList;

    @ApiModelProperty(value = "属性1 列表值")
    @ApiModelProperty(value = "属性1 列表值"  ,hidden = true)
    @TableField(exist = false)
    private List<CateAttr> attrFirstList;

    @ApiModelProperty(value = "属性2 列表值")
    @ApiModelProperty(value = "属性2 列表值"  ,hidden = true)
    @TableField(exist = false)
    private List<CateAttr> attrSecondList;

@@ -115,4 +115,11 @@
    @TableField(exist = false)
    private List<CateBudget> budgetList;

    @ApiModelProperty(value = "属性1 列表值")
    @TableField(exist = false)
    private List<CateParamSelect> cateParamFirstList;

    @ApiModelProperty(value = "属性2 列表值")
    @TableField(exist = false)
    private List<CateParamSelect> cateParamSecondList;
}