实现报告生成合并单元格；修复部分bug

value

2024-05-09 f8a3a9826738a397bdf4aff4ca7a5116344b5a0a

 cnas-server/src/main/java/com/yuanchu/mom/dto/DepartmentDto.java

@@ -2,12 +2,14 @@

import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.util.ArrayList;
import java.util.List;

@Data
@AllArgsConstructor
@NoArgsConstructor
public class DepartmentDto {

    private Integer id;