diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java index 669ef51..e152249 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java @@ -99,6 +99,13 @@ private Long dataId; /** + * 外观及功能性检查 + */ + @ApiModelProperty(value = "外观及功能性检查-多功能校准源", dataType = "String") + @TableField(exist = false) + private String appearanceFunctionCheck; + + /** * 原始记录文件(minio存储文件名) */ @ApiModelProperty(value = "原始记录文件(minio存储文件名)", dataType = "String") @@ -245,12 +252,14 @@ @TableField(exist = false) private String temperature; - - @ApiModelProperty(value = "所使用的标准、主要测量设备(前端必传,打印需要)", dataType = "List") @TableField(exist = false) private List equipmentList; + @ApiModelProperty(value = "所使用的标准、主要测量设备id列表(前端必传,打印需要)",dataType = "List") + @TableField(exist = false) + private List equipmentIds; + @ApiModelProperty(value = "结论(前端必传,打印需要)", dataType = "String") @TableField(exist = false) private String conclusion; @@ -275,6 +284,10 @@ @TableField(exist = false) private List measureDataPistonGaugeList; + @ApiModelProperty(value = "检定数据-多功能电器安全(打印需要)", dataType = "List") + @TableField(exist = false) + private List measureDataElectricalSafetyList; + @ApiModelProperty(value = "标准装置编号", dataType = "String") @TableField(exist = false) private String belongStandardEquipment;