From 97db75238a96a75f41bafd469548c2a84ba37080 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期五, 28 九月 2018 14:31:04 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dto/Dev_param.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 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..d1970fe 100644
--- a/gx_tieta/src/com/fgkj/dto/Dev_param.java
+++ b/gx_tieta/src/com/fgkj/dto/Dev_param.java
@@ -13,6 +13,10 @@
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 note;
public Integer getNum() {
@@ -82,6 +86,24 @@
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;
+ }
@Override
public String toString() {
return "Dev_param [num=" + num + ", dev_id=" + dev_id + ", alm_id="
@@ -89,8 +111,11 @@
+ 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 + ", note=" + note + "]";
}
+
}
--
Gitblit v1.9.1