From 5f585252c155d62109a937563285e36d32b1b0de Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期二, 08 一月 2019 15:13:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java
index 2a03418..ca71748 100644
--- a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java
+++ b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java
@@ -180,6 +180,8 @@
if(b) {
success+=1;
list.get(i).setNum(1);
+ List listbatt=dao.serchByCondition(fs);
+ list.get(i).setObj(listbatt);
}
}
}
--
Gitblit v1.9.1