From 67047bebb45c0426ac96df76ed18e3879ffc09b0 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.26>
Date: 星期四, 18 十月 2018 11:49:59 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/services/BattInfServices.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java
index 8fd9956..bd09022 100644
--- a/gx_tieta/src/com/fgkj/services/BattInfServices.java
+++ b/gx_tieta/src/com/fgkj/services/BattInfServices.java
@@ -880,10 +880,10 @@
BattInf_Rebuild brinf=(BattInf_Rebuild) listr.get(z);
if((j+1)==brinf.getNew_monum()&&b.getBattGroupId()==brinf.getNew_battgroupid()){
b.setBattProducer(brinf.getOld_battproducer());
+ b.setNum(1);
}
if((j+1)==brinf.getOld_monum()&&b.getBattGroupId()==brinf.getOld_battgroupid()){
b.setNum(0);
- break;
}
}
list_b.add(b);
--
Gitblit v1.9.1