From 294468d95066c1f8a4af74b1dbdd44b45564d288 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 05 十一月 2018 17:32:01 +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_gprs_state.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/ram/Bts_gprs_state.java b/gx_tieta/src/com/fgkj/dto/ram/Bts_gprs_state.java
index 193283a..4ef3af6 100644
--- a/gx_tieta/src/com/fgkj/dto/ram/Bts_gprs_state.java
+++ b/gx_tieta/src/com/fgkj/dto/ram/Bts_gprs_state.java
@@ -7,8 +7,8 @@
private int num;
private int dev_id;
private int op_cmd;
- private Date record_datetime;
- private String scq_val;
+ private String AT_cmd;
+ private String ack_inf;
private String note;
private String stationName;
private String FBSDeviceName;
@@ -30,17 +30,18 @@
public void setOp_cmd(int op_cmd) {
this.op_cmd = op_cmd;
}
- public Date getRecord_datetime() {
- return record_datetime;
+
+ public String getAT_cmd() {
+ return AT_cmd;
}
- public void setRecord_datetime(Date record_datetime) {
- this.record_datetime = record_datetime;
+ public void setAT_cmd(String aT_cmd) {
+ AT_cmd = aT_cmd;
}
- public String getScq_val() {
- return scq_val;
+ public String getAck_inf() {
+ return ack_inf;
}
- public void setScq_val(String scq_val) {
- this.scq_val = scq_val;
+ public void setAck_inf(String ack_inf) {
+ this.ack_inf = ack_inf;
}
public String getNote() {
return note;
@@ -63,11 +64,11 @@
@Override
public String toString() {
return "Bts_gprs_state [num=" + num + ", dev_id=" + dev_id
- + ", op_cmd=" + op_cmd + ", record_datetime=" + record_datetime
- + ", scq_val=" + scq_val + ", note=" + note + ", stationName="
- + stationName + ", FBSDeviceName=" + FBSDeviceName + "]";
+ + ", op_cmd=" + op_cmd + ", AT_cmd=" + AT_cmd + ", ack_inf="
+ + ack_inf + ", note=" + note + ", stationName=" + stationName
+ + ", FBSDeviceName=" + FBSDeviceName + "]";
}
-
+
}
--
Gitblit v1.9.1