Commit 2c3a630f65d07d9bd011d2bb07a10ebbb51728ad
Exists in
master
Merge branch 'master' into cnt-1.1.0-alfa2
Showing
1 changed file
with
8 additions
and
6 deletions
Show diff stats
cit-tabelas-corp-api/src/main/java/br/com/centralit/api/model/EstruturaOrganizacional.java
... | ... | @@ -26,17 +26,17 @@ import org.hibernate.envers.AuditTable; |
26 | 26 | import org.hibernate.envers.Audited; |
27 | 27 | import org.hibernate.envers.NotAudited; |
28 | 28 | |
29 | +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | |
30 | +import com.fasterxml.jackson.annotation.JsonView; | |
31 | +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; | |
32 | +import com.fasterxml.jackson.databind.annotation.JsonSerialize; | |
33 | + | |
29 | 34 | import br.com.centralit.framework.json.JsonCalendarSimpleDateDeserializer; |
30 | 35 | import br.com.centralit.framework.json.JsonCalendarSimpleDateSerializer; |
31 | 36 | import br.com.centralit.framework.json.Views; |
32 | 37 | import br.com.centralit.framework.model.Dominio; |
33 | 38 | import br.com.centralit.framework.model.arquitetura.PersistentObjectAuditOrganizacao; |
34 | 39 | |
35 | -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | |
36 | -import com.fasterxml.jackson.annotation.JsonView; | |
37 | -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; | |
38 | -import com.fasterxml.jackson.databind.annotation.JsonSerialize; | |
39 | - | |
40 | 40 | /** |
41 | 41 | * <p> |
42 | 42 | * <img src="http://centralit.com.br/images/logo_central.png"> |
... | ... | @@ -161,7 +161,9 @@ public class EstruturaOrganizacional extends PersistentObjectAuditOrganizacao im |
161 | 161 | private Long idEstruturaOrganizacionalParent; |
162 | 162 | |
163 | 163 | @Transient |
164 | - @JsonView({ Views.GenericView.class, Views.EstruturaOrganizacionalAutoCompleteSimplesView.class, Views.EstruturaOrganizacionalPatrimonioListView.class, Views.TransferenciaListView.class, Views.TransferenciaEditView.class, Views.BaixaEditView.class, Views.TermoResponsabilidadeListView.class, Views.TermoResponsabilidadeEditView.class, Views.EstruturaOrganizacionalEditView.class, Views.EstruturaOrganizacionalListView.class, Views.BemPatrimonialEditView.class, Views.MaterialConsultaInfo.class }) | |
164 | + @JsonView({ Views.GenericView.class, Views.EstruturaOrganizacionalAutoCompleteSimplesView.class, Views.EstruturaOrganizacionalPatrimonioListView.class, Views.TransferenciaListView.class, | |
165 | + Views.TransferenciaEditView.class, Views.BaixaEditView.class, Views.TermoResponsabilidadeListView.class, Views.TermoResponsabilidadeEditView.class, Views.EstruturaOrganizacionalEditView.class, | |
166 | + Views.EstruturaOrganizacionalListView.class, Views.BemPatrimonialEditView.class, Views.MaterialConsultaInfo.class, Views.MaterialLocalEstoqueView.class }) | |
165 | 167 | private String codigoENome; |
166 | 168 | |
167 | 169 | /** Atributo unidadeGestora. */ | ... | ... |