From 12c384847af42270e2ba167467173a928a59ded2 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期四, 29 十一月 2018 10:05:03 +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/ram/Fbs9100s_dfu_state.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/ram/Fbs9100s_dfu_state.java b/gx_tieta/src/com/fgkj/dto/ram/Fbs9100s_dfu_state.java
index 83b381f..8269888 100644
--- a/gx_tieta/src/com/fgkj/dto/ram/Fbs9100s_dfu_state.java
+++ b/gx_tieta/src/com/fgkj/dto/ram/Fbs9100s_dfu_state.java
@@ -13,12 +13,15 @@
private int dfu_en;
private int dfu_wr_stat;
private int dfu_data_blocknum;
+ private int dfu_file_len;
private int dfu_data_blocklen;
private String dfu_password;
private String stationName;
private String stationId;
private String fBSDeviceName;
+
+ private String note;
public int getNum() {
return num;
}
@@ -109,6 +112,18 @@
public void setfBSDeviceName(String fBSDeviceName) {
this.fBSDeviceName = fBSDeviceName;
}
+ public int getDfu_file_len() {
+ return dfu_file_len;
+ }
+ public void setDfu_file_len(int dfu_file_len) {
+ this.dfu_file_len = dfu_file_len;
+ }
+ public String getNote() {
+ return note;
+ }
+ public void setNote(String note) {
+ this.note = note;
+ }
@Override
public String toString() {
return "Fbs9100s_dfu_state [num=" + num + ", dev_id=" + dev_id
@@ -117,11 +132,12 @@
+ ", softVersion_dev=" + softVersion_dev + ", dfu_file="
+ dfu_file + ", dfu_en=" + dfu_en + ", dfu_wr_stat="
+ dfu_wr_stat + ", dfu_data_blocknum=" + dfu_data_blocknum
- + ", dfu_data_blocklen=" + dfu_data_blocklen
- + ", dfu_password=" + dfu_password + ", stationName="
- + stationName + ", stationId=" + stationId + ", fBSDeviceName="
- + fBSDeviceName + "]";
+ + ", dfu_file_len=" + dfu_file_len + ", dfu_data_blocklen="
+ + dfu_data_blocklen + ", dfu_password=" + dfu_password
+ + ", stationName=" + stationName + ", stationId=" + stationId
+ + ", fBSDeviceName=" + fBSDeviceName + ", note=" + note + "]";
}
+
}
--
Gitblit v1.9.1