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/EntTestSendtask.java | 94 ++++++++--------------------------------------
1 files changed, 17 insertions(+), 77 deletions(-)
diff --git a/src/main/java/com/ots/project/exam/domain/EntTestSendtask.java b/src/main/java/com/ots/project/exam/domain/EntTestSendtask.java
index ede76d6..3e361a8 100644
--- a/src/main/java/com/ots/project/exam/domain/EntTestSendtask.java
+++ b/src/main/java/com/ots/project/exam/domain/EntTestSendtask.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,114 +6,55 @@
import lombok.Setter;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-
import java.util.Date;
-/**
- * 璇勬祴閭�璇峰彂閫佷换鍔″璞� ent_test_sendtask
- *
- * @author ots
- * @date 2019-12-19
- */
@Getter
@Setter
public class EntTestSendtask extends BaseEntity {
private static final long serialVersionUID = 1L;
-
- /**
- * 缂栫爜
- */
+
private Long id;
-
- /**
- * 鐢ㄦ埛ID
- */
+
private Long userId;
-
- /**
- * 娴嬭瘯鍖呯紪鐮�
- */
+
private Long testId;
-
- /**
- * 璇勬祴浜哄憳缂栫爜
- */
+
private Long memberId;
-
- /**
- * 鍙戜欢浜�
- */
+
private String fromAddressee;
-
- /**
- * 鏀朵欢浜�
- */
+
@Excel(name = "鏀朵欢浜�")
private String addressee;
-
- /**
- * 鍙戦�佺被鍨�
- */
+
@Excel(name = "鍙戦�佺被鍨�")
private String type;
-
- /**
- * 鍙戦�佸钩鍙�
- */
+
@Excel(name = "鍙戦�佸钩鍙�")
private String platform;
-
- /**
- * 鏍囬
- */
+
@Excel(name = "鏍囬")
private String title;
-
- /**
- * 鍐呭
- */
+
@Excel(name = "鍐呭")
private String content;
-
- /**
- * 鐭俊鏉℃暟
- */
+
@Excel(name = "鐭俊鏉℃暟")
private Long number;
-
- /**
- * 鐘舵��
- */
+
@Excel(name = "鐘舵��")
private String status;
-
- /**
- * 杩囩▼淇℃伅
- */
+
@Excel(name = "杩囩▼淇℃伅")
private String message;
-
- /**
- * 鐭俊骞冲彴浠诲姟缂栫爜
- */
+
private String taskId;
-
- /**
- * 閭欢骞冲彴浠诲姟缂栫爜
- */
+
private String rushtaskid;
-
- /**
- * 鍙戦�佹椂闂�
- */
+
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sendTime;
-
- /**
- * 寤堕暱鐨勫彂閫佹椂闂�
- */
+
private String sendExtendTime;
-
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
--
Gitblit v1.9.1