From c02e430f16cb51cabb6f4b24f99ec48efc7b0596 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.26>
Date: 星期三, 21 十一月 2018 11:59:20 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

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

diff --git a/gx_tieta/src/com/fgkj/actions/ram/Bts_gprs_stateAction.java b/gx_tieta/src/com/fgkj/actions/ram/Bts_gprs_stateAction.java
index cd3b042..d787d79 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Bts_gprs_stateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Bts_gprs_stateAction.java
@@ -15,7 +15,7 @@
 	private String json;
 	private String result;
 	
-	//淇敼绯荤粺鍙傛暟
+	//鑾峰彇gprs淇″彿
 	public String update() {
 		Bts_gprs_state gprs = getGson().fromJson(json, Bts_gprs_state.class);
 		ServiceModel model = service.update(gprs);
@@ -29,7 +29,7 @@
 		result = tojson(model);		
 		return SUCCESS;	
 	}
-	//鏍规嵁璁惧id鏌ヨ绯荤粺鍙傛暟(涓�瀹氭槸琚鐞嗙殑)
+	 //鏍规嵁璁惧id璇诲彇鐨勮澶囪繛鎺ョ殑gprs妯″潡鐨勪俊鍙峰��
 	public String serchByCondition(){
 		Bts_gprs_state gprs = getGson().fromJson(json, Bts_gprs_state.class);
 		ServiceModel model = service.serchByCondition(gprs);

--
Gitblit v1.9.1