From a50eeca38aac03ba7a4fb9f27f73133936b8597a Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 05 十二月 2018 17:38:10 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java b/gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java
index 6539372..7dea7e9 100644
--- a/gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java
+++ b/gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java
@@ -32,6 +32,7 @@
private int station_stat_xuhang;
private Date station_xuhang_start_time;
+ private Date station_xuhang_end_time;
private int station_xuhang_tlong;
private String note;
@@ -213,6 +214,13 @@
public void setStation_xuhang_start_time(Date station_xuhang_start_time) {
this.station_xuhang_start_time = station_xuhang_start_time;
}
+
+ public Date getStation_xuhang_end_time() {
+ return station_xuhang_end_time;
+ }
+ public void setStation_xuhang_end_time(Date station_xuhang_end_time) {
+ this.station_xuhang_end_time = station_xuhang_end_time;
+ }
public int getStation_xuhang_tlong() {
return station_xuhang_tlong;
}
@@ -244,7 +252,8 @@
+ station_dooropen_start_time + ", station_dooropen_tlong="
+ station_dooropen_tlong + ", station_stat_xuhang="
+ station_stat_xuhang + ", station_xuhang_start_time="
- + station_xuhang_start_time + ", station_xuhang_tlong="
+ + station_xuhang_start_time + ", station_xuhang_end_time="
+ + station_xuhang_end_time + ", station_xuhang_tlong="
+ station_xuhang_tlong + ", note=" + note + ", stationName="
+ stationName + ", stationName1=" + stationName1
+ ", stationName2=" + stationName2 + ", stationName3="
@@ -256,4 +265,5 @@
+
}
--
Gitblit v1.9.1