From d7049dae792f0a6d2ee4246acf4b42bf0b36635c Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@USER-20180117QL>
Date: 星期二, 25 十二月 2018 11:11:02 +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/BatttestdatastopDAOImpl.java | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BatttestdatastopDAOImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BatttestdatastopDAOImpl.java
index 2bb1a5c..95ea981 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BatttestdatastopDAOImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BatttestdatastopDAOImpl.java
@@ -478,7 +478,6 @@
for(int i=0;i<list.size();i++){
Batttestdatastop sdata=list.get(i);
sdata.setNote(binf.getBattProducer());
- sdata.setStationid(binf.getStationId());
for (int j = 0; j < listr.size(); j++) {
BattInf_Rebuild brinf=(BattInf_Rebuild) listr.get(j);
if(sdata.getMon_num()==brinf.getOld_monum()&&sdata.getBattGroupId()==brinf.getOld_battgroupid()){
--
Gitblit v1.9.1