From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期一, 12 四月 2021 15:44:53 +0800
Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua
---
src/main/java/com/ots/project/exam/domain/TTextContent.java | 32 +++-----------------------------
1 files changed, 3 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/ots/project/exam/domain/TTextContent.java b/src/main/java/com/ots/project/exam/domain/TTextContent.java
index 1c84e7d..f48b5b1 100644
--- a/src/main/java/com/ots/project/exam/domain/TTextContent.java
+++ b/src/main/java/com/ots/project/exam/domain/TTextContent.java
@@ -1,5 +1,4 @@
package com.ots.project.exam.domain;
-
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ots.framework.aspectj.lang.annotation.Excel;
import com.ots.framework.web.domain.BaseEntity;
@@ -7,50 +6,27 @@
import lombok.Setter;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-
import java.util.Date;
-/**
- * 棰樼洰鐨勫唴瀹瑰璞� t_text_content
- *
- * @author ots
- * @date 2019-11-24
- */
@Getter
@Setter
public class TTextContent extends BaseEntity {
private static final long serialVersionUID = 1L;
-
- /**
- * null
- */
+
private Long id;
-
- /**
- * null
- */
+
@Excel(name = "null")
private String content;
-
-
- /**
- * 鏇存柊鏃堕棿
- */
+
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
-
private Date createTime;
-
-
public TTextContent() {
}
-
-
public TTextContent(String content, Date createTime) {
this.content = content;
this.createTime = createTime;
}
-
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -59,12 +35,10 @@
.append("createTime", getCreateTime())
.toString();
}
-
@Override
public Date getCreateTime() {
return createTime;
}
-
@Override
public void setCreateTime(Date createTime) {
this.createTime = createTime;
--
Gitblit v1.9.1