From 98b2fabde2fb45cec7a10546eee7e71d6db6b01c Mon Sep 17 00:00:00 2001
From: valdir <valdir@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 8 Aug 2018 19:33:04 +0000
Subject: [PATCH] =?UTF-8?q?0011635:=20Relat=C3=B3rio=20exporta=C3=A7=C3=A3?=
 =?UTF-8?q?o=20idoso=20ARTESP=20bug#11635=20bug#11693=20bug#11694=20dev:th?=
 =?UTF-8?q?iago=20qua:marcelo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@84054 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../entidad/CategoriaDescuento.java           | 21 ++++++++++++++++++-
 .../ventaboletos/entidad/OrgaoEmpParam.java   | 11 ++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/com/rjconsultores/ventaboletos/entidad/CategoriaDescuento.java b/src/com/rjconsultores/ventaboletos/entidad/CategoriaDescuento.java
index 5eca35ade..fa77d74fc 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/CategoriaDescuento.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/CategoriaDescuento.java
@@ -111,7 +111,11 @@ public class CategoriaDescuento implements Serializable {
 	@Column(name = "INDEXIGEFECNACIMIENTOPASAJERO")
 	private Boolean indexigefecnacimientopasajero;
 	@Column(name = "INDEXIGEDOC2PASSAGEIRO")
-	private Boolean indExigeDoc2Passageiro;	
+	private Boolean indExigeDoc2Passageiro;
+	@Column(name = "INDEXIGEENDERECOPASSAGEIRO")
+	private Boolean indExigeEnderecoPassageiro;
+	@Column(name = "INDEXIGEEMAILPASSAGEIRO")
+	private Boolean indExigeEmailPassageiro;	
 	
 	@Column(name = "INDSEGUNDA")
 	private Boolean indSegunda;
@@ -667,4 +671,19 @@ public class CategoriaDescuento implements Serializable {
 		this.indnaoaplicatarifaminima = indnaoaplicatarifaminima;
 	}
 
+	public Boolean getIndExigeEnderecoPassageiro() {
+		return indExigeEnderecoPassageiro;
+	}
+
+	public void setIndExigeEnderecoPassageiro(Boolean indExigeEnderecoPassageiro) {
+		this.indExigeEnderecoPassageiro = indExigeEnderecoPassageiro;
+	}
+
+	public Boolean getIndExigeEmailPassageiro() {
+		return indExigeEmailPassageiro;
+	}
+
+	public void setIndExigeEmailPassageiro(Boolean indExigeEmailPassageiro) {
+		this.indExigeEmailPassageiro = indExigeEmailPassageiro;
+	}
 }
diff --git a/src/com/rjconsultores/ventaboletos/entidad/OrgaoEmpParam.java b/src/com/rjconsultores/ventaboletos/entidad/OrgaoEmpParam.java
index b5f4089a4..10f225bc7 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/OrgaoEmpParam.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/OrgaoEmpParam.java
@@ -52,6 +52,17 @@ public class OrgaoEmpParam implements Serializable {
 	
 	@Column(name = "USUARIO_ID")
 	private Integer usuarioId;
+	
+	@Column(name = "CODEMPRESAPORORGAO", length=30)
+	private String codEmpresaPorOrgao;
+	
+	public String getCodEmpresaPorOrgao() {
+		return codEmpresaPorOrgao;
+	}
+
+	public void setCodEmpresaPorOrgao(String codEmpresaPorOrgao) {
+		this.codEmpresaPorOrgao = codEmpresaPorOrgao;
+	}
 
 	public Integer getOrgaoempparamId() {
 		return orgaoempparamId;