From d7049dae792f0a6d2ee4246acf4b42bf0b36635c Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@USER-20180117QL>
Date: 星期二, 25 十二月 2018 11:11:02 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
index 53ec2d7..0df18be 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
+++ b/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);
--
Gitblit v1.9.1