~whyclxw/ResMeterManager.git

			@@ -10,6 +10,7 @@
			import lombok.experimental.Accessors;

			import java.io.Serializable;
			import java.util.Date;

			/**
			* <p>
			@@ -40,19 +41,70 @@
			private Integer monNum;

			@ApiModelProperty(value = "电压(V)")
			private Float bv;
			private String bv;

			@ApiModelProperty(value = "内阻（mΩ）")
			private Float br;
			private String br;

			@ApiModelProperty(value = "电导")
			private Float bs;
			private String bs;

			@ApiModelProperty(value = "连接条阻抗（mΩ）")
			private Float cr;
			private String cr;

			@ApiModelProperty(value = "异常标记 0:无异常 1:鼓包 2:漏液 4:开裂 8:内阻超标")
			private int er;
			private Integer er;

			@TableField(exist = false)
			private Date testTime;
			@TableField(exist = false)
			private boolean lowVolFlag;
			@TableField(exist = false)
			private boolean highVolFlag;
			@TableField(exist = false)
			@ApiModelProperty("内阻高告警")
			private boolean highResFlag1;
			@TableField(exist = false)
			@ApiModelProperty("内阻高严重告警")
			private boolean highResFlag2;
			@TableField(exist = false)
			@ApiModelProperty("电导告警标识")
			private boolean highSerFlag1;
			@TableField(exist = false)
			@ApiModelProperty("电导更换标识")
			private boolean highSerFlag2;
			@TableField(exist = false)
			@ApiModelProperty("连接条告警标识")
			private boolean highChainResFlag1;
			@TableField(exist = false)
			@ApiModelProperty("连接条更换标识")
			private boolean highChainResFlag2;

			@TableField(exist = false)
			@ApiModelProperty("评价")
			private String resEvaluation;
			@TableField(exist = false)
			private String monNumStr;

			@TableField(exist = false)
			@ApiModelProperty("预估容量")
			private float estimatedCap;

			@TableField(exist = false)
			@ApiModelProperty("预估容量百分比")
			private float preCapPercent;

			@TableField(exist = false)
			@ApiModelProperty("内阻偏差率")
			private float resDevRate;

			@TableField(exist = false)
			@ApiModelProperty("预估容量百分比字符串")
			private String preCapPercentStr;


			@TableField(exist = false)
			@ApiModelProperty("平均标称内阻(计算出的)")
			private float avgRes ;

			}