From 294468d95066c1f8a4af74b1dbdd44b45564d288 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 05 十一月 2018 17:32:01 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/actions/ram/Bts_gprs_stateAction.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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..e921a55 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,9 +16,9 @@
 	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);
+		ServiceModel model = service.updateGprs(gprs);
 		{   String msg="";
 		    if(gprs.getNum()==FBS9100_ComBase.CMD_ReadGPRSCSQ){
 				 msg="鑾峰彇"+gprs.getDev_id()+"鐨勮澶囩郴缁熷弬鏁�";
@@ -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