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

jiangping

2024-06-19 af9932d1d6fe3bd56799dcd8b4d76dc993c5c1db

 server/service/src/main/java/com/doumee/dao/business/dto/UnionApplyBXDDTO.java

@@ -1,6 +1,5 @@
package com.doumee.dao.business.dto;

import com.doumee.core.annotation.excel.ExcelColumn;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -38,6 +37,6 @@
    private String fileName;

    @ApiModelProperty(value = "合并单明细保单信息")
    private List<UnionApplyBXDDDetailTO> unionApplyBXDDDetailTOList;
    private List<UnionApplyBXDDetailDTO> unionApplyBXDDDetailDTOList;
    
}