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 | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 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 c028e97..74b4e80 100644
--- a/gx_tieta/src/com/fgkj/dto/Dev_param.java
+++ b/gx_tieta/src/com/fgkj/dto/Dev_param.java
@@ -13,6 +13,11 @@
private Integer alm_low_level;
private Integer alm_high_en;
private Integer alm_low_en;
+
+ private String stationName;
+ private String stationName1;
+ private String stationName2;
+ private String stationName5;
private String note;
public Integer getNum() {
@@ -82,6 +87,31 @@
public void setNote(String note) {
this.note = note;
}
+ public String getStationName() {
+ return stationName;
+ }
+ public void setStationName(String stationName) {
+ this.stationName = stationName;
+ }
+ public String getStationName1() {
+ return stationName1;
+ }
+ 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 "Dev_param [num=" + num + ", dev_id=" + dev_id + ", alm_id="
@@ -89,8 +119,12 @@
+ alm_high_coe + ", alm_low_coe=" + alm_low_coe
+ ", alm_high_level=" + alm_high_level + ", alm_low_level="
+ alm_low_level + ", alm_high_en=" + alm_high_en
- + ", alm_low_en=" + alm_low_en + ", note=" + note + "]";
+ + ", alm_low_en=" + alm_low_en + ", stationName=" + stationName
+ + ", stationName1=" + stationName1 + ", stationName2="
+ + stationName2 + ", stationName5=" + stationName5 + ", note="
+ + note + "]";
}
+
}
--
Gitblit v1.9.1