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

jiaosong

2023-09-11 47f9dffa729e76ae5d0f2f845f55d8cc7179e8ac

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

 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;
}