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/EntTestMemberBackstage.java |   74 ++++++++-----------------------------
 1 files changed, 16 insertions(+), 58 deletions(-)

diff --git a/src/main/java/com/ots/project/exam/domain/EntTestMemberBackstage.java b/src/main/java/com/ots/project/exam/domain/EntTestMemberBackstage.java
index ee045a0..c6a3f2d 100644
--- a/src/main/java/com/ots/project/exam/domain/EntTestMemberBackstage.java
+++ b/src/main/java/com/ots/project/exam/domain/EntTestMemberBackstage.java
@@ -1,90 +1,64 @@
 package com.ots.project.exam.domain;
-
 import com.ots.framework.aspectj.lang.annotation.Excel;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-
 import com.ots.framework.web.domain.BaseEntity;
 import java.util.Date;
 
-/**
- * EntTestMemberBackstage瀵硅薄 ent_test_member_backstage
- * 
- * @author ots
- * @date 2020-02-29
- */
 public class EntTestMemberBackstage extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
-
-    /** 璇勬祴浜哄憳缂栫爜 */
+    
     private Long memberId;
-
-    /** 鍚嶇О */
+    
     @Excel(name = "鍚嶇О")
     private String memberName;
-
-    /** 閮ㄩ棬 */
+    
     @Excel(name = "閮ㄩ棬")
     private String memberDept;
-
-    /** 閭 */
+    
     @Excel(name = "閭")
     private String memberEmail;
-
-    /** 鎵嬫満鍙风爜 */
+    
     @Excel(name = "鎵嬫満鍙风爜")
     private String memberPhone;
-
-    /** 娴嬭瘯鍖呯紪鐮� */
+    
     @Excel(name = "娴嬭瘯鍖呯紪鐮�")
     private Long testId;
-
-    /** 娴嬭瘯code */
+    
     @Excel(name = "娴嬭瘯code")
     private String token;
-
-    /** 寮�濮嬬瓟棰樻椂闂� */
+    
     @Excel(name = "寮�濮嬬瓟棰樻椂闂�", width = 30, dateFormat = "yyyy-MM-dd")
     private Date startTime;
-
-    /** null */
+    
     @Excel(name = "null", width = 30, dateFormat = "yyyy-MM-dd")
     private Date endTime;
-
-    /** 鐭伅鍙戦�佺姸鎬侊紙0鏈鐞� 1宸插彂閫� 2鍙戦�佷腑 3鍙戦�佸け璐� 4閫�淇★級 */
+    
     @Excel(name = "鐭伅鍙戦�佺姸鎬�", readConverterExp = "0=鏈鐞�,1=宸插彂閫�,2=鍙戦�佷腑,3=鍙戦�佸け璐�,4=閫�淇�")
     private String smsStatus;
-
-    /** 鐭俊鍙戦�佹椂闂� */
+    
     @Excel(name = "鐭俊鍙戦�佹椂闂�", width = 30, dateFormat = "yyyy-MM-dd")
     private Date smsTime;
-
-    /** 閭欢鍙戦�佺姸鎬� (0鏈鐞� 1宸插彂閫� 2鍙戦�佷腑 3鍙戦�佸け璐� 4閫�淇�) */
+    
     @Excel(name = "閭欢鍙戦�佺姸鎬� (0鏈鐞� 1宸插彂閫� 2鍙戦�佷腑 3鍙戦�佸け璐� 4閫�淇�)")
     private String emailStatus;
-
-    /** 閭欢鍙戦�佹椂闂� */
+    
     @Excel(name = "閭欢鍙戦�佹椂闂�", width = 30, dateFormat = "yyyy-MM-dd")
     private Date emailTime;
-
-    /** 0鏈鐞� 1宸插畬鎴� 2绛旈涓� 3浣滃簾 */
+    
     @Excel(name = "0鏈鐞� 1宸插畬鎴� 2绛旈涓� 3浣滃簾")
     private String status;
-
-    /** null */
+    
     @Excel(name = "null")
     private String firstname;
-
-    /** null */
+    
     @Excel(name = "null")
     private String lastname;
-
     public void setMemberId(Long memberId) 
     {
         this.memberId = memberId;
     }
-
     public Long getMemberId() 
     {
         return memberId;
@@ -93,7 +67,6 @@
     {
         this.memberName = memberName;
     }
-
     public String getMemberName() 
     {
         return memberName;
@@ -102,7 +75,6 @@
     {
         this.memberDept = memberDept;
     }
-
     public String getMemberDept() 
     {
         return memberDept;
@@ -111,7 +83,6 @@
     {
         this.memberEmail = memberEmail;
     }
-
     public String getMemberEmail() 
     {
         return memberEmail;
@@ -120,7 +91,6 @@
     {
         this.memberPhone = memberPhone;
     }
-
     public String getMemberPhone() 
     {
         return memberPhone;
@@ -129,7 +99,6 @@
     {
         this.testId = testId;
     }
-
     public Long getTestId() 
     {
         return testId;
@@ -138,7 +107,6 @@
     {
         this.token = token;
     }
-
     public String getToken() 
     {
         return token;
@@ -147,7 +115,6 @@
     {
         this.startTime = startTime;
     }
-
     public Date getStartTime() 
     {
         return startTime;
@@ -156,7 +123,6 @@
     {
         this.endTime = endTime;
     }
-
     public Date getEndTime() 
     {
         return endTime;
@@ -165,7 +131,6 @@
     {
         this.smsStatus = smsStatus;
     }
-
     public String getSmsStatus() 
     {
         return smsStatus;
@@ -174,7 +139,6 @@
     {
         this.smsTime = smsTime;
     }
-
     public Date getSmsTime() 
     {
         return smsTime;
@@ -183,7 +147,6 @@
     {
         this.emailStatus = emailStatus;
     }
-
     public String getEmailStatus() 
     {
         return emailStatus;
@@ -192,7 +155,6 @@
     {
         this.emailTime = emailTime;
     }
-
     public Date getEmailTime() 
     {
         return emailTime;
@@ -201,7 +163,6 @@
     {
         this.status = status;
     }
-
     public String getStatus() 
     {
         return status;
@@ -210,7 +171,6 @@
     {
         this.firstname = firstname;
     }
-
     public String getFirstname() 
     {
         return firstname;
@@ -219,12 +179,10 @@
     {
         this.lastname = lastname;
     }
-
     public String getLastname() 
     {
         return lastname;
     }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

--
Gitblit v1.9.1