Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev...

hdw

2019-01-19 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd

 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 + "]";

   }

   

   

	
}