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

k94314517

2023-09-19 682a6e95720bc41cbd42480c2352301496091d89

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

@@ -78,5 +78,7 @@
    @ExcelColumn(name="所属品类编码(关联category表)")
    private Integer categoryId;


    @ApiModelProperty(value = "选择品类参数主键(关联 base_cate_param 表)", example = "1")
    @ExcelColumn(name="选择品类参数主键(关联 base_cate_param 表)")
    private Integer baseCateParamId;
}