From 4f39b4da8aae5c905cb35f32a2112db2c488e07f Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期六, 05 一月 2019 11:20:11 +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/BattInfImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index 3c2f22b..e2c4b09 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -4487,7 +4487,7 @@
 		}*/
 		return list;
 	}
-
+    
 	public static void main(String[] args) throws ParseException {
 		//new BattInfImpl().searchAll();
 		

--
Gitblit v1.9.1