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/dao/impl/App_bts_comm_taskImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/App_bts_comm_taskImpl.java b/gx_tieta/src/com/fgkj/dao/impl/App_bts_comm_taskImpl.java
index b16cab1..ef9d2fc 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/App_bts_comm_taskImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/App_bts_comm_taskImpl.java
@@ -43,7 +43,7 @@
 		// TODO Auto-generated method stub
 		return null;
 	}
-    //鏍规嵁鐪佸競鍖烘満鎴垮悕绉版煡璇�(uid鏀惧湪num涓�)
+    //鏍规嵁璁惧id鏌ヨ(uid鏀惧湪num涓�)
 	public List serchByCondition(Object obj) {
 		BattInf binf=(BattInf) obj;
 		Page page=binf.getPage();

--
Gitblit v1.9.1