Merge remote-tracking branch 'origin/master'

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectServiceImpl.java

@@ -99,9 +99,9 @@ public class ObjectServiceImpl extends BaseServiceImpl<InspectObjectMapper, Obje
 			vo = BeanUtil.copy(dto, ObjectEntity.class);
 			if(Func.isNotEmpty(dto.getRealId())){
 				vo.setName(dto.getOtherName());
-				vo.setAddress(dto.getOtherAddress());
-				vo.setLgtd(dto.getOtherLgtd());
-				vo.setLttd(dto.getOtherLttd());
+				vo.setAddress(Optional.ofNullable(dto.getOtherAddress()).orElse(vo.getAddress()));
+				vo.setLgtd(Optional.ofNullable(dto.getOtherLgtd()).orElse(vo.getLgtd()));
+				vo.setLttd(Optional.ofNullable(dto.getOtherLttd()).orElse(vo.getLttd()));
 			}
 		}
 		return vo;