From 7cacbc5938897458ee26ad7aac097c857f4bc3c7 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 05 十二月 2018 17:49:07 +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/App_bts_comm_task.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/App_bts_comm_task.java b/gx_tieta/src/com/fgkj/dto/App_bts_comm_task.java
index 0ef987f..70d3385 100644
--- a/gx_tieta/src/com/fgkj/dto/App_bts_comm_task.java
+++ b/gx_tieta/src/com/fgkj/dto/App_bts_comm_task.java
@@ -16,7 +16,7 @@
private int battgroup_index3;
private int battgroup_id4;
private int battgroup_index4;
- private Date connect_time;
+ private Date connet_time;
private Date dev_comm_runtime;
private int break_type;//break_type 锛�0锛屾垚鍔熻繛鎺ワ紱1锛屾壘涓嶅埌瀵瑰簲dev_id锛�2锛岄�氫俊寮傚父鏂紑
private String stationName;
@@ -98,11 +98,11 @@
public void setBattgroup_index4(int battgroup_index4) {
this.battgroup_index4 = battgroup_index4;
}
- public Date getConnect_time() {
- return connect_time;
+ public Date getConnet_time() {
+ return connet_time;
}
- public void setConnect_time(Date connect_time) {
- this.connect_time = connect_time;
+ public void setConnet_time(Date connet_time) {
+ this.connet_time = connet_time;
}
public Date getDev_comm_runtime() {
return dev_comm_runtime;
@@ -167,7 +167,7 @@
+ ", battgroup_index2=" + battgroup_index2 + ", battgroup_id3="
+ battgroup_id3 + ", battgroup_index3=" + battgroup_index3
+ ", battgroup_id4=" + battgroup_id4 + ", battgroup_index4="
- + battgroup_index4 + ", connect_time=" + connect_time
+ + battgroup_index4 + ", connect_time=" + connet_time
+ ", dev_comm_runtime=" + dev_comm_runtime + ", break_type="
+ break_type + ", stationName=" + stationName
+ ", stationName1=" + stationName1 + ", stationName2="
--
Gitblit v1.9.1