|
@@ -8,14 +8,14 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
|
|
|
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
|
|
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
|
|
|
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
|
|
|
-import com.ruoyi.common.core.domain.BaseEntity;
|
|
|
import lombok.Data;
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
|
+import java.util.Date;
|
|
|
|
|
|
@Data
|
|
|
@TableName("ddt_origin_brand")
|
|
|
-public class Brand extends BaseEntity {
|
|
|
+public class Brand {
|
|
|
@TableId("brand_id")
|
|
|
private String brandId;
|
|
|
@TableField("brand_img")
|
|
@@ -61,6 +61,11 @@ public class Brand extends BaseEntity {
|
|
|
private LocalDateTime enterTime;
|
|
|
@TableField("hash")
|
|
|
private String hash;
|
|
|
+ @TableField("update_time")
|
|
|
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
|
+ @JsonSerialize(using = LocalDateTimeSerializer.class)
|
|
|
+ @JsonDeserialize(using = LocalDateTimeDeserializer.class)
|
|
|
+ private LocalDateTime updateTime;
|
|
|
|
|
|
@TableField("show_delete")
|
|
|
private int showDelete;
|