From a6b4c1e19b3b3fdcf80d7f69f20fe406205fcf8f Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.20>
Date: 星期一, 26 十一月 2018 11:54:39 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

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

diff --git a/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java b/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java
index 3f974c1..30619c4 100644
--- a/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java
@@ -42,7 +42,7 @@
 		return SUCCESS;
 	}
 	
-	//0.5鏌ヨ瀹炴椂鍛婅鏁�
+	//0.5鏌ヨ瀹炴椂鍛婅鏁�(鐢垫睜鍛婅鐜�)
 	public String serchAlm(){
 		User_inf uinf=(User_inf) ActionUtil.getUser();
 		bmd.setUinf(uinf);

--
Gitblit v1.9.1