Merge remote-tracking branch 'origin/master'

jiangping

2025-05-07 b96cc19f216ccd7451a5d2758055a4f174587ba9

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java

@@ -160,8 +160,9 @@
    private Integer categoryId;

    @ApiModelProperty(value = "关联分类名称")
    @ExcelColumn(name="关联分类名称")
    @ExcelColumn(name="车辆分类" ,index = 8,width = 16)
    private String categoryName;

    @ApiModelProperty(value = "关联父级分类编码（关联category)", example = "1")
    @ExcelColumn(name="关联父级分类编码（关联category)")
    private Integer categoryParentId;