From f52d3b910556fcadf0ae262bafa251756e06488c Mon Sep 17 00:00:00 2001
From: 军 <军@hp-pc>
Date: 星期日, 30 九月 2018 11:41:48 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/services/BattInfServices.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java
index 0875b15..9561969 100644
--- a/gx_tieta/src/com/fgkj/services/BattInfServices.java
+++ b/gx_tieta/src/com/fgkj/services/BattInfServices.java
@@ -768,7 +768,8 @@
 			    	for (int j = 0; j <binf.getMonCount(); j++) {
 			    		Batttestdatastop sdata=new Batttestdatastop();
 			    		sdata.setMon_num(j+1);
-			    		sdata.setTest_cap(binf.getMonCapStd()/binf.getMonCount());//娌℃湁鏀剧數榛樿涓烘爣绉�
+			    		sdata.setTest_cap(binf.getMonCapStd());//娌℃湁鏀剧數榛樿涓烘爣绉�
+			    		sdata.setPercent(1f);
 			    		list_sdata.add(sdata);
 					}
 			    }

--
Gitblit v1.9.1