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/EntTestMemberOther.java | 102 ++++++++------------------------------------------
1 files changed, 17 insertions(+), 85 deletions(-)
diff --git a/src/main/java/com/ots/project/exam/domain/EntTestMemberOther.java b/src/main/java/com/ots/project/exam/domain/EntTestMemberOther.java
index 81a5326..8745a32 100644
--- a/src/main/java/com/ots/project/exam/domain/EntTestMemberOther.java
+++ b/src/main/java/com/ots/project/exam/domain/EntTestMemberOther.java
@@ -1,129 +1,61 @@
package com.ots.project.exam.domain;
-
import com.ots.framework.aspectj.lang.annotation.Excel;
import com.ots.framework.web.domain.BaseEntity;
import lombok.Getter;
import lombok.Setter;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-
import java.util.Date;
import java.util.List;
-/**
- * 娴嬭瘎浜哄憳鍚嶅崟瀵硅薄 ent_test_member
- *
- * @author ots
- * @date 2019-12-15
- */
@Getter
@Setter
public class EntTestMemberOther extends BaseEntity {
private static final long serialVersionUID = 1L;
- /**
- * 璇勬祴浜哄憳缂栫爜
- */
+
private Long memberId;
-
- /**
- * 鍚嶇О
- */
+
@Excel(name = "濮撳悕锛團ull Name锛�")
private String memberName;
-
@Excel(name = "娴嬭瘯閾炬帴锛圱est Url锛�")
private String testUrl;
-
- /**
- * 閮ㄩ棬
- */
+
private String memberDept;
-
- /**
- * 閭
- */
+
private String memberEmail;
-
- /**
- * 鎵嬫満鍙风爜
- */
+
private String memberPhone;
-
- /**
- * 娴嬭瘯鍖呯紪鐮�
- */
+
private Long testId;
-
- /**
- * 娴嬭瘯code
- */
+
private String token;
-
- /**
- * 绛旈鏃堕棿
- */
+
private Date startTime;
-
private Date endTime;
-
- /**
- * 鐭俊鐘舵��
- */
+
private String smsStatus;
-
- /**
- * 鐭俊鏃堕棿
- */
+
private Date smsTime;
-
- /**
- * 閭欢鐘舵��
- */
+
private String emailStatus;
-
- /**
- * 閭欢鏃堕棿
- */
+
private Date emailTime;
-
- /**
- * 鐘舵��
- */
+
private String status;
-
-
private String firstName;
-
private String lastName;
-
private String userName;
-
private String testName;
-
private Long userId;
-
private List<Long> userList;
-
private Integer sendHrEmail;
-
- /**
- * 鎶ュ憡鍦板潃
- */
+
private String reportAddress;
-
- /**
- * 鎶ュ憡缂栫爜
- */
+
private Long reportId;
-
- /**
- * HR閭欢鐘舵��
- */
+
private String hrEmailStatus;
-
- /**
- * HR閭欢鏃堕棿
- */
+
private Date hrEmailTime;
@Override
public String toString() {
--
Gitblit v1.9.1