fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'bug#al-3082' (!100) from AL3082 into master 

Reviewed-on: adm/ModelWeb#100
Reviewed-by: Wilian Domingues <wilian@rjconsultores.com.br>
master
Valdir Cordeiro 2023-09-28 20:50:55 +00:00
parent c67c6bb519 2107edc94a
commit 1d18e216b5
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ModelWeb</artifactId>
<version>1.15.0</version>
<version>1.16.0</version>
<distributionManagement>
<repository>

27
src/com/rjconsultores/ventaboletos/entidad/Empresa.java
View File

@ -35,6 +35,7 @@ import org.hibernate.annotations.Where;
import com.rjconsultores.ventaboletos.enums.TipoCstGratuidade;
import br.com.rjconsultores.auditador.annotations.AuditarAtributo;
import br.com.rjconsultores.auditador.annotations.AuditarID;
import br.com.rjconsultores.auditador.annotations.NaoAuditar;
import br.com.rjconsultores.auditador.interfaces.Auditavel;
@ -419,6 +420,16 @@ public class Empresa implements Serializable, Auditavel<Empresa> {
@Column(name = "INDTAXACONVENIENCIASOVENDA")
private Boolean indTaxaConvenienciaSoVenda;
@Column(name = "HORAINICIOEMBARQUE")
@Temporal(TemporalType.TIME)
@AuditarAtributo(pattern = "HH:mm")
private Date horaInicioEmbarque;
@Column(name = "HORAFIMEMBARQUE")
@Temporal(TemporalType.TIME)
@AuditarAtributo(pattern = "HH:mm")
private Date horaFimEmbarque;
@Transient
@NaoAuditar
@ -1559,4 +1570,20 @@ public class Empresa implements Serializable, Auditavel<Empresa> {
public void setIndTaxaConvenienciaSoVenda(Boolean indTaxaConvenienciaSoVenda) {
this.indTaxaConvenienciaSoVenda = indTaxaConvenienciaSoVenda;
}
public Date getHoraInicioEmbarque() {
return horaInicioEmbarque;
}
public void setHoraInicioEmbarque(Date horaInicioEmbarque) {
this.horaInicioEmbarque = horaInicioEmbarque;
}
public Date getHoraFimEmbarque() {
return horaFimEmbarque;
}
public void setHoraFimEmbarque(Date horaFimEmbarque) {
this.horaFimEmbarque = horaFimEmbarque;
}
}