From d7049dae792f0a6d2ee4246acf4b42bf0b36635c Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@USER-20180117QL>
Date: 星期二, 25 十二月 2018 11:11:02 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dto/Batttestdatastop.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/Batttestdatastop.java b/gx_tieta/src/com/fgkj/dto/Batttestdatastop.java
index 61a4c52..2cd0157 100644
--- a/gx_tieta/src/com/fgkj/dto/Batttestdatastop.java
+++ b/gx_tieta/src/com/fgkj/dto/Batttestdatastop.java
@@ -25,6 +25,7 @@
private Float mon_min;
private Float mon_max;
private float percent;
+ private String note;
public Batttestdatastop() {
}
@@ -198,6 +199,15 @@
this.percent = percent;
}
+ public String getNote() {
+ return note;
+ }
+
+ public void setNote(String note) {
+ this.note = note;
+ }
+
+
@Override
public String toString() {
return "Batttestdatastop [num=" + num + ", BattGroupId=" + BattGroupId
@@ -210,10 +220,15 @@
+ ", test_cap=" + test_cap + ", mon_num=" + mon_num
+ ", mon_vol=" + mon_vol + ", lowC=" + lowC + ", lowV=" + lowV
+ ", mon_avg=" + mon_avg + ", mon_min=" + mon_min
- + ", mon_max=" + mon_max + ", percent=" + percent + "]";
+ + ", mon_max=" + mon_max + ", percent=" + percent + ", note="
+ + note + "]";
}
+
+
+
+
--
Gitblit v1.9.1