From 64f1199ba78e7c8e808f735290b5486398b4e447 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.32>
Date: 星期五, 23 十一月 2018 10:45:17 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
index d1b03ac..97f1712 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
@@ -1261,7 +1261,7 @@
}
return list;
}
- //0.5鏌ヨ瀹炴椂鍛婅鏁�
+ //0.5鏌ヨ瀹炴椂鍛婅鏁�(鐢垫睜鍛婅鐜�)
/*public List serchAlm(Object obj){
Batt_Maint_Dealarm bmd=(Batt_Maint_Dealarm) obj;
Battalarm_data adata=bmd.getAdata();
--
Gitblit v1.9.1