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/EntTestPackage.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ots/project/exam/domain/EntTestPackage.java b/src/main/java/com/ots/project/exam/domain/EntTestPackage.java
index 3350027..aed2e99 100644
--- a/src/main/java/com/ots/project/exam/domain/EntTestPackage.java
+++ b/src/main/java/com/ots/project/exam/domain/EntTestPackage.java
@@ -1,12 +1,10 @@
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;
@@ -172,7 +170,11 @@
private String phonenumber;
-
+ /**
+ * 娴嬭瘯鑰呮帴鏀舵姤鍛婃ā鏉�
+ * @return
+ */
+ private String memberTemplate;
@Override
@@ -193,6 +195,7 @@
.append("invalidTime", getInvalidTime())
.append("status", getStatus())
.append("remark", getRemark())
+ .append("memberTemplate", getMemberTemplate())
.toString();
}
}
--
Gitblit v1.9.1