diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskExcleNewRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskExcleNewRespVO.java index 3956373..ef1d0c3 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskExcleNewRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskExcleNewRespVO.java @@ -43,11 +43,11 @@ public class EmergencyTaskExcleNewRespVO { @Schema(description = "险情危害(如:无)", requiredMode = Schema.RequiredMode.REQUIRED, example = "16325") @ExcelProperty("险情危害") - private Integer emergencyHarmId; + private Integer emergencyHarmNum; @Schema(description = "数量/株", requiredMode = Schema.RequiredMode.REQUIRED, example = "3371") @ExcelProperty("数量/株") - private Integer emergencyHarmNum; + private Integer emergencyTypeNum; @Schema(description = "抢险开始时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("抢险开始时间") diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyExportNewHandler.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyExportNewHandler.java index be36967..1845feb 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyExportNewHandler.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyExportNewHandler.java @@ -63,13 +63,13 @@ public class EmergencyExportNewHandler implements ExcelExportHandler