From 67047bebb45c0426ac96df76ed18e3879ffc09b0 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.26>
Date: 星期四, 18 十月 2018 11:49:59 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/actions/ram/Bts_station_stateAction.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/actions/ram/Bts_station_stateAction.java b/gx_tieta/src/com/fgkj/actions/ram/Bts_station_stateAction.java
index 3f890b4..d9b5ec5 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Bts_station_stateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Bts_station_stateAction.java
@@ -10,7 +10,7 @@
     private String  json;
     private String result;
     //鏌ヨ鏈烘埧瀹炴椂鐘舵��
-    private String serchByCondition(){
+    public String serchByCondition(){
     	BattInf binf=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
     	ServiceModel model=service.serchByCondition(binf);
     	result=tojson(model);

--
Gitblit v1.9.1