From 0e1721488e6d8f091d13403e20f0bbf5cf397b96 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期二, 18 十二月 2018 18:08:00 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dto/Batt_Maint_Dealarm.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/Batt_Maint_Dealarm.java b/gx_tieta/src/com/fgkj/dto/Batt_Maint_Dealarm.java
index f210e6e..68140d5 100644
--- a/gx_tieta/src/com/fgkj/dto/Batt_Maint_Dealarm.java
+++ b/gx_tieta/src/com/fgkj/dto/Batt_Maint_Dealarm.java
@@ -5,6 +5,7 @@
public class Batt_Maint_Dealarm implements Serializable{
private BattInf binf; //battinf瀵硅薄淇℃伅
+ private BattInf_Rebuild brinf; //BattInf_Rebuild瀵硅薄
private Batt_maintenance_inf minf; //Batt_maintenance_inf瀵硅薄淇℃伅
private Batt_maint_inf mainf; //Batt_maint_inf瀵硅薄淇℃伅
private Batt_maint_process mprocess; //Batt_maint_process瀵硅薄淇℃伅
@@ -127,16 +128,22 @@
public void setAdata_H(Battalarm_data_history adata_H) {
this.adata_H = adata_H;
}
+ public BattInf_Rebuild getBrinf() {
+ return brinf;
+ }
+ public void setBrinf(BattInf_Rebuild brinf) {
+ this.brinf = brinf;
+ }
@Override
public String toString() {
- return "Batt_Maint_Dealarm [binf=" + binf + ", minf=" + minf
- + ", mainf=" + mainf + ", mprocess=" + mprocess + ", uinf="
- + uinf + ", tdata=" + tdata + ", rinf=" + rinf + ", rdata="
- + rdata + ", adata=" + adata + ", sdata=" + sdata + ", page="
- + page + ", bplan=" + bplan + ", binformation=" + binformation
- + ", bdmon=" + bdmon + ", adata_H=" + adata_H + "]";
+ return "Batt_Maint_Dealarm [binf=" + binf + ", brinf=" + brinf
+ + ", minf=" + minf + ", mainf=" + mainf + ", mprocess="
+ + mprocess + ", uinf=" + uinf + ", tdata=" + tdata + ", rinf="
+ + rinf + ", rdata=" + rdata + ", adata=" + adata + ", sdata="
+ + sdata + ", page=" + page + ", bplan=" + bplan
+ + ", binformation=" + binformation + ", bdmon=" + bdmon
+ + ", adata_H=" + adata_H + "]";
}
-
--
Gitblit v1.9.1