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/Subject.java |   21 ---------------------
 1 files changed, 0 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/ots/project/exam/domain/Subject.java b/src/main/java/com/ots/project/exam/domain/Subject.java
index e224a82..26755ca 100644
--- a/src/main/java/com/ots/project/exam/domain/Subject.java
+++ b/src/main/java/com/ots/project/exam/domain/Subject.java
@@ -1,67 +1,46 @@
 package com.ots.project.exam.domain;
-
 import java.io.Serializable;
-
 public class Subject implements Serializable {
-
     private static final long serialVersionUID = 8058095034457106501L;
-
     private Integer id;
-
     private String name;
-
     private Integer level;
-
     private String levelName;
-
     private Integer itemOrder;
-
     private Boolean deleted;
-
     public Integer getId() {
         return id;
     }
-
     public void setId(Integer id) {
         this.id = id;
     }
-
     public String getName() {
         return name;
     }
-
     public void setName(String name) {
         this.name = name == null ? null : name.trim();
     }
-
     public Integer getLevel() {
         return level;
     }
-
     public void setLevel(Integer level) {
         this.level = level;
     }
-
     public String getLevelName() {
         return levelName;
     }
-
     public void setLevelName(String levelName) {
         this.levelName = levelName == null ? null : levelName.trim();
     }
-
     public Integer getItemOrder() {
         return itemOrder;
     }
-
     public void setItemOrder(Integer itemOrder) {
         this.itemOrder = itemOrder;
     }
-
     public Boolean getDeleted() {
         return deleted;
     }
-
     public void setDeleted(Boolean deleted) {
         this.deleted = deleted;
     }

--
Gitblit v1.9.1