|
@@ -4,7 +4,6 @@ import com.alibaba.excel.annotation.ExcelIgnore;
|
|
|
import com.alibaba.excel.annotation.ExcelProperty;
|
|
import com.alibaba.excel.annotation.ExcelProperty;
|
|
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
|
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
|
|
-import com.fasterxml.jackson.annotation.JsonInclude;
|
|
|
|
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
|
import org.hibernate.envers.Audited;
|
|
import org.hibernate.envers.Audited;
|
|
|
import org.springframework.data.annotation.CreatedBy;
|
|
import org.springframework.data.annotation.CreatedBy;
|
|
@@ -13,13 +12,15 @@ import org.springframework.data.annotation.LastModifiedBy;
|
|
|
import org.springframework.data.annotation.LastModifiedDate;
|
|
import org.springframework.data.annotation.LastModifiedDate;
|
|
|
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
|
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
|
|
|
|
|
|
|
-import javax.persistence.*;
|
|
|
|
|
|
|
+import javax.persistence.Column;
|
|
|
|
|
+import javax.persistence.EntityListeners;
|
|
|
|
|
+import javax.persistence.MappedSuperclass;
|
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
|
|
|
|
|
|
@MappedSuperclass
|
|
@MappedSuperclass
|
|
|
@Audited
|
|
@Audited
|
|
|
@EntityListeners(AuditingEntityListener.class)
|
|
@EntityListeners(AuditingEntityListener.class)
|
|
|
-@JsonInclude(JsonInclude.Include.NON_NULL)
|
|
|
|
|
|
|
+//@JsonInclude(JsonInclude.Include.NON_NULL)
|
|
|
@JsonIgnoreProperties(value = {"hibernateLazyInitializer"}, ignoreUnknown = true)
|
|
@JsonIgnoreProperties(value = {"hibernateLazyInitializer"}, ignoreUnknown = true)
|
|
|
public abstract class BaseEntityNoID {
|
|
public abstract class BaseEntityNoID {
|
|
|
@ExcelIgnore
|
|
@ExcelIgnore
|
