chengyao преди 4 години
родител
ревизия
1bdcc665fd
променени са 2 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 1 1
      src/main/java/com/diagbot/dto/QualityControlDTO.java
  2. 2 2
      src/main/java/com/diagbot/dto/QualityControlDeptDTO.java

+ 1 - 1
src/main/java/com/diagbot/dto/QualityControlDTO.java

@@ -52,7 +52,7 @@ public class QualityControlDTO {
     /**
      * 科室名称
      */
-    @Excel(name = "科室名称", width = 16, orderNum = "4",mergeVertical = true)
+    @Excel(name = "科室名称", width = 16, orderNum = "4")
     private String deptName;
 
     /**

+ 2 - 2
src/main/java/com/diagbot/dto/QualityControlDeptDTO.java

@@ -41,7 +41,7 @@ public class QualityControlDeptDTO {
     /**
      * 医生姓名
      */
-    @Excel(name = "主治医生", width = 12, orderNum = "3",mergeVertical = true)
+    @Excel(name = "主治医生", width = 12, orderNum = "3")
     private String doctorName;
 
     /**
@@ -51,7 +51,7 @@ public class QualityControlDeptDTO {
     /**
      * 科室名称
      */
-    @Excel(name = "科室名称", width = 16, orderNum = "4",mergeVertical = true)
+    @Excel(name = "科室名称", width = 16, orderNum = "4")
     private String deptName;
 
     /**