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/TExamLevel.java | 28 +++++-----------------------
1 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/ots/project/exam/domain/TExamLevel.java b/src/main/java/com/ots/project/exam/domain/TExamLevel.java
index ae0cab8..6f4c8e8 100644
--- a/src/main/java/com/ots/project/exam/domain/TExamLevel.java
+++ b/src/main/java/com/ots/project/exam/domain/TExamLevel.java
@@ -1,51 +1,33 @@
package com.ots.project.exam.domain;
-
import com.ots.framework.aspectj.lang.annotation.Excel;
import lombok.Getter;
import lombok.Setter;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-
import com.ots.framework.web.domain.BaseEntity;
-/**
- * 闂嵎绫诲瀷瀵硅薄 t_exam_level
- *
- * @author ots
- * @date 2019-12-15
- */
@Getter
@Setter
public class TExamLevel extends BaseEntity
{
private static final long serialVersionUID = 1L;
-
- /** 闂嵎缂栫爜 */
+
private Long id;
-
- /** 闂嵎鍚嶇О */
+
@Excel(name = "闂嵎鍚嶇О")
private String levelName;
-
private String langType;
-
@Excel(name = "澶囨敞")
private String remark;
-
- // 棰樼洰缁村害Id
+
private Integer subjectId;
-
- /**棰樼洰妯℃澘id*/
+
private String questionTemplateId;
-
- /**棰樼洰妯℃澘鍚嶇О*/
+
@Excel(name = "棰樼洰妯℃澘")
private String questionTemplateName;
-
private String uuid;
-
private Integer type;
-
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
--
Gitblit v1.9.1