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

hdw

2019-01-19 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd

 gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java

@@ -314,7 +314,7 @@
            try {

               while(rs.next()) {

                  int station_stat=rs.getInt("station_stat");

                  if((station_stat&1024)>1) {

                  if((station_stat&2048)>1) {

                     list.add(1);

                  }else {

                     list.add(0);

@@ -347,7 +347,7 @@
      binf.setStationName2("");

      binf.setStationName3("");

      binf.setStationName5("");

      binf.setStationId("42000603");

      binf.setStationId("42000408");

      binf.setBattGroupNum(62);

      User_inf uinf=new User_inf();

      uinf.setUId(1002);