From 9ddc2aee31b9afc21659b378932a0f46f43071c2 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.24>
Date: 星期日, 30 九月 2018 11:50:57 +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 | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/Batttestdatastop.java b/gx_tieta/src/com/fgkj/dto/Batttestdatastop.java
index 3a971dc..61a4c52 100644
--- a/gx_tieta/src/com/fgkj/dto/Batttestdatastop.java
+++ b/gx_tieta/src/com/fgkj/dto/Batttestdatastop.java
@@ -24,7 +24,7 @@
private Float mon_avg;
private Float mon_min;
private Float mon_max;
-
+ private float percent;
public Batttestdatastop() {
}
@@ -189,6 +189,14 @@
public void setMon_max(Float mon_max) {
this.mon_max = mon_max;
}
+
+ public float getPercent() {
+ return percent;
+ }
+
+ public void setPercent(float percent) {
+ this.percent = percent;
+ }
@Override
public String toString() {
@@ -202,10 +210,11 @@
+ ", 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 + "]";
+ + ", mon_max=" + mon_max + ", percent=" + percent + "]";
}
+
--
Gitblit v1.9.1