From cdd5fe1813e63adcddd61581cb886b9d154e5a3c Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.31.211>
Date: 星期三, 16 一月 2019 19:19:38 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/BattInfAction.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/BattInfAction.java b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
index e80575f..cfdda43 100644
--- a/gx_tieta/src/com/fgkj/actions/BattInfAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
@@ -433,9 +433,9 @@
return SUCCESS;
}
//鍒ゆ柇鏂板鐨勬満鎴挎槸鍚﹀瓨鍦�
- public String judgeBattInOrNot(){
+ public String judgeBatt(){
BattInf binf=getGson().fromJson(json, BattInf.class);
- ServiceModel model = service.judgeBattInOrNot(binf);
+ ServiceModel model = service.judgeBatt(binf);
result = ActionUtil.tojson(model);
return SUCCESS;
}
--
Gitblit v1.9.1