From f7f9c854c5b662aadceca474cb0958407cda098d Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.27>
Date: 星期二, 06 十一月 2018 10:45:08 +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_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..49359b6 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
@@ -16,7 +16,7 @@
 	private String result;
 	
 	//淇敼绯荤粺鍙傛暟
-	public String update() {
+	public String updateGprs() {
 		Bts_gprs_state gprs = getGson().fromJson(json, Bts_gprs_state.class);
 		ServiceModel model = service.update(gprs);
 		{   String msg="";
@@ -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