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

hdw

2018-10-26 e458320cba7664a484d3a763e288047edb74d55f

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

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

@@ -107,7 +107,7 @@
            sql+=" ) ";

        }

        if(binf.getBattGroupNum()==0){

            sql+=" and station_stat=0 ";

            sql+=" and station_stat<0 ";            //当没有选择想要查看的机房异常状态是筛选

        }

        //分页

        String orderSql=" limit ? ,? ";