From fc36338476ccb0e8fa641794de4022f300f59a2e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 16 七月 2024 13:59:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/domain/ExamTemplatesSubject.java | 38 ++++++--------------------------------
1 files changed, 6 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/domain/ExamTemplatesSubject.java b/src/main/java/com/mindskip/xzs/domain/ExamTemplatesSubject.java
index 61f6623..04e7c5a 100644
--- a/src/main/java/com/mindskip/xzs/domain/ExamTemplatesSubject.java
+++ b/src/main/java/com/mindskip/xzs/domain/ExamTemplatesSubject.java
@@ -1,45 +1,19 @@
package com.mindskip.xzs.domain;
import io.swagger.models.auth.In;
+import lombok.Data;
import java.io.Serializable;
+@Data
public class ExamTemplatesSubject implements Serializable {
private Integer id;
+
private Integer subjectId;
+
+ private String subjectName;
+
private Integer templatesId;
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getSubjectId() {
- return subjectId;
- }
-
- public void setSubjectId(Integer subjectId) {
- this.subjectId = subjectId;
- }
-
- public Integer getTemplatesId() {
- return templatesId;
- }
-
- public void setTemplatesId(Integer templatesId) {
- this.templatesId = templatesId;
- }
-
- @Override
- public String toString() {
- return "ExamTemplatesSubject{" +
- "id=" + id +
- ", subjectId=" + subjectId +
- ", templatesId=" + templatesId +
- '}';
- }
}
--
Gitblit v1.8.0