From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001 From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139> Date: 星期五, 18 一月 2019 17:30:50 +0800 Subject: [PATCH] 未审批可更改 --- gx_tieta/src/com/fgkj/dto/Batt_devalarm_data.java | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/gx_tieta/src/com/fgkj/dto/Batt_devalarm_data.java b/gx_tieta/src/com/fgkj/dto/Batt_devalarm_data.java index 1bb7032..db4fcbb 100644 --- a/gx_tieta/src/com/fgkj/dto/Batt_devalarm_data.java +++ b/gx_tieta/src/com/fgkj/dto/Batt_devalarm_data.java @@ -22,6 +22,8 @@ private String dev_name;//璁惧鍚嶇О private String stationName;//鏈烘埧鍚嶇О private String stationName1;//缁存姢鍖哄悕绉� + private String stationName2;//甯傜骇 + private String stationName5;//鍖哄幙 private String stationId;//鏈烘埧id private Page page;//鍒嗛〉 private User_inf uinf; @@ -149,6 +151,18 @@ public void setStationName1(String stationName1) { this.stationName1 = stationName1; } + public String getStationName2() { + return stationName2; + } + public void setStationName2(String stationName2) { + this.stationName2 = stationName2; + } + public String getStationName5() { + return stationName5; + } + public void setStationName5(String stationName5) { + this.stationName5 = stationName5; + } @Override public String toString() { return "Batt_devalarm_data [num=" + num + ", record_id=" + record_id @@ -160,9 +174,11 @@ + alm_confirmed_time + ", alm_cleared_type=" + alm_cleared_type + ", usr_id=" + usr_id + ", note=" + note + ", dev_name=" + dev_name + ", stationName=" + stationName + ", stationName1=" - + stationName1 + ", stationId=" + stationId + ", page=" + page - + ", uinf=" + uinf + "]"; + + stationName1 + ", stationName2=" + stationName2 + + ", stationName5=" + stationName5 + ", stationId=" + stationId + + ", page=" + page + ", uinf=" + uinf + "]"; } + } -- Gitblit v1.9.1