Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java

@@ -178,7 +178,7 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
                 }
             });
         } else {
-            IcResiCollectEntity collectInfo = baseDao.selectByAddress(formDTO.getAddress());
+            IcResiCollectEntity collectInfo = baseDao.selectById(formDTO.getId());
             //更新主表
             baseDao.updateRec(collectInfo.getId(), formDTO.getHouseType(), formDTO.getHouseHolderName(), formDTO.getTotalResi(),null);
             List<IcResiMemberEntity> newMemberList = ConvertUtils.sourceToTarget(formDTO.getMemberList(), IcResiMemberEntity.class);