Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git i...

LiJun

2018-11-13 ab25922c19981835d2fefb54e7d4e53e34f14529

 gx_tieta/src/com/fgkj/dto/BattInf.java

@@ -80,6 +80,9 @@
   private Page page;

   private Object obj;

   private String station_phone;

	
   private Battinf_ex binf_ex;

	
   public BattInf() {

      super();

   }

@@ -534,6 +537,12 @@
   public void setStation_install(Integer station_install) {

      Station_install = station_install;

   }

   public Battinf_ex getBinf_ex() {

      return binf_ex;

   }

   public void setBinf_ex(Battinf_ex binf_ex) {

      this.binf_ex = binf_ex;

   }

   @Override

   public String toString() {

      return "BattInf [num=" + num + ", StationId=" + StationId

@@ -575,6 +584,7 @@
            + ", SignalName=" + SignalName + ", StartNum=" + StartNum

            + ", Station_install=" + Station_install + ", Size=" + Size

            + ", page=" + page + ", obj=" + obj + ", station_phone="

            + station_phone + "]";

            + station_phone + ", binf_ex=" + binf_ex + "]";

   }

	
}