From daf105a4c7cfd299d6473939b4d678a3e9f91f23 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.18>
Date: 星期四, 01 十一月 2018 17:37:50 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dto/User_Chart.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/User_Chart.java b/gx_tieta/src/com/fgkj/dto/User_Chart.java
index ecc3d15..0a45174 100644
--- a/gx_tieta/src/com/fgkj/dto/User_Chart.java
+++ b/gx_tieta/src/com/fgkj/dto/User_Chart.java
@@ -14,6 +14,8 @@
private File Chart_behind;
private File Chart_warn;
private File Chart_timeout;
+ private File Chart_poff; //鍋滅數
+ private File Chart_install;//鏈坊鍔犵殑鍥炬爣
private File Chart_nuclear_cap;//鏍稿鏀剧數
private File Chart_dev_alarm;//璁惧鍛婅
@@ -136,14 +138,28 @@
public void setChart_timeout_blob(Blob chart_timeout_blob) {
Chart_timeout_blob = chart_timeout_blob;
}
+ public File getChart_poff() {
+ return Chart_poff;
+ }
+ public void setChart_poff(File chart_poff) {
+ Chart_poff = chart_poff;
+ }
+ public File getChart_install() {
+ return Chart_install;
+ }
+ public void setChart_install(File chart_install) {
+ Chart_install = chart_install;
+ }
@Override
public String toString() {
return "User_Chart [num=" + num + ", Chart_name=" + Chart_name
+ ", Chart_file=" + Chart_file + ", Chart_logo=" + Chart_logo
+ ", Chart_normal=" + Chart_normal + ", Chart_behind="
+ Chart_behind + ", Chart_warn=" + Chart_warn
- + ", Chart_timeout=" + Chart_timeout + ", Chart_nuclear_cap="
- + Chart_nuclear_cap + ", Chart_dev_alarm=" + Chart_dev_alarm
+ + ", Chart_timeout=" + Chart_timeout + ", Chart_poff="
+ + Chart_poff + ", Chart_install=" + Chart_install
+ + ", Chart_nuclear_cap=" + Chart_nuclear_cap
+ + ", Chart_dev_alarm=" + Chart_dev_alarm
+ ", Chart_pre_charge=" + Chart_pre_charge
+ ", Chart_online_charge=" + Chart_online_charge
+ ", Chart_logo_blob=" + Chart_logo_blob
@@ -154,4 +170,5 @@
}
+
}
--
Gitblit v1.9.1