From acf7627f5c57d62fd7d93dd9794911c6e7b4e42f Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.28>
Date: 星期五, 19 十月 2018 14:15:51 +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