From 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期六, 19 一月 2019 09:16:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dto/Dev_param.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/Dev_param.java b/gx_tieta/src/com/fgkj/dto/Dev_param.java
index d1970fe..74b4e80 100644
--- a/gx_tieta/src/com/fgkj/dto/Dev_param.java
+++ b/gx_tieta/src/com/fgkj/dto/Dev_param.java
@@ -17,6 +17,7 @@
private String stationName;
private String stationName1;
private String stationName2;
+ private String stationName5;
private String note;
public Integer getNum() {
@@ -104,6 +105,13 @@
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 "Dev_param [num=" + num + ", dev_id=" + dev_id + ", alm_id="
@@ -113,7 +121,8 @@
+ alm_low_level + ", alm_high_en=" + alm_high_en
+ ", alm_low_en=" + alm_low_en + ", stationName=" + stationName
+ ", stationName1=" + stationName1 + ", stationName2="
- + stationName2 + ", note=" + note + "]";
+ + stationName2 + ", stationName5=" + stationName5 + ", note="
+ + note + "]";
}
--
Gitblit v1.9.1