From daf105a4c7cfd299d6473939b4d678a3e9f91f23 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.18>
Date: 星期四, 01 十一月 2018 17:37:50 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java
index a146e85..0d3825a 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java
@@ -397,6 +397,8 @@
binf.setBattInUseDate1(ActionUtil.getSimpDate(date2));
binf.setStationName1("");
binf.setStationName("");
+ binf.setStationName2("");
+ binf.setStationName5("");
binf.setBattGroupId(0);
binf.setBattProducer("");
Page page=new Page();
@@ -410,7 +412,7 @@
bmd.setUinf(uinf);
List<Batt_Maint_Dealarm> list=bimpl.serchByInfo(bmd);
for (Batt_Maint_Dealarm b : list) {
- System.out.println(b.getBdmon());
+ System.out.println(b);
}
}
--
Gitblit v1.9.1