diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index bf6de94..69b7b32 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -23,6 +23,7 @@ import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** @@ -384,13 +385,13 @@ @ApiModelProperty(value = "检定数据-多功能校准源(新增/更新/详情参数)", dataType = "List") @TableField(exist = false) - private List measureDataCalibratorList; + private List measureDataCalibratorList = new ArrayList<>(); @ApiModelProperty(value = "检定数据-0.02级活塞式压力计(新增/更新/详情参数)", dataType = "List") @TableField(exist = false) - private List measureDataPistonGaugeList; + private List measureDataPistonGaugeList = new ArrayList<>(); @ApiModelProperty(value = "检定数据-多功能电气安全校准器(新增/更新/详情参数)", dataType = "List") @TableField(exist = false) - private List measureDataElectricalSafetyList; + private List measureDataElectricalSafetyList = new ArrayList<>(); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index bf6de94..69b7b32 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -23,6 +23,7 @@ import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** @@ -384,13 +385,13 @@ @ApiModelProperty(value = "检定数据-多功能校准源(新增/更新/详情参数)", dataType = "List") @TableField(exist = false) - private List measureDataCalibratorList; + private List measureDataCalibratorList = new ArrayList<>(); @ApiModelProperty(value = "检定数据-0.02级活塞式压力计(新增/更新/详情参数)", dataType = "List") @TableField(exist = false) - private List measureDataPistonGaugeList; + private List measureDataPistonGaugeList = new ArrayList<>(); @ApiModelProperty(value = "检定数据-多功能电气安全校准器(新增/更新/详情参数)", dataType = "List") @TableField(exist = false) - private List measureDataElectricalSafetyList; + private List measureDataElectricalSafetyList = new ArrayList<>(); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java index 2d07565..098e881 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java @@ -16,6 +16,7 @@ import javax.validation.constraints.NotEmpty; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** @@ -194,18 +195,18 @@ @ApiModelProperty(value = "核查标准设备(详情返回参数)", dataType = "Object") @TableField(exist = false) - private List checkEquipmentList; + private List checkEquipmentList = new ArrayList<>(); @ApiModelProperty(value = "核查数据-多功能校准源", dataType = "List") @TableField(exist = false) - private List checkDataCalibratorList; + private List checkDataCalibratorList = new ArrayList<>(); @ApiModelProperty(value = "核查数据-0.02级活塞式压力计", dataType = "List") @TableField(exist = false) - private List checkDataPistonGaugeList; + private List checkDataPistonGaugeList = new ArrayList<>(); @ApiModelProperty(value = "核查数据-多功能电气安全校准器", dataType = "List") @TableField(exist = false) - private List checkDataElectricalSafetyList; + private List checkDataElectricalSafetyList = new ArrayList<>(); }