From 7e3f433e160ac588a2fa189ac8929daa9598413c Mon Sep 17 00:00:00 2001 From: liuchengqian Date: Mon, 28 Feb 2022 21:01:46 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xkrs/model/entity/DataDict.java | 2 +- .../java/com/xkrs/model/qo/DataDictQo.java | 32 +++++++++++-------- .../com/xkrs/model/qo/DataDictUpdateQo.java | 17 ++++++---- 3 files changed, 29 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/xkrs/model/entity/DataDict.java b/src/main/java/com/xkrs/model/entity/DataDict.java index 78a363c..049cf61 100644 --- a/src/main/java/com/xkrs/model/entity/DataDict.java +++ b/src/main/java/com/xkrs/model/entity/DataDict.java @@ -25,7 +25,7 @@ public class DataDict { private String inspectionItemCode; /** - * 质检项代码 + * 质检项名称 */ @Column(length = 85, columnDefinition = "varchar(85)") private String inspectionItemName; diff --git a/src/main/java/com/xkrs/model/qo/DataDictQo.java b/src/main/java/com/xkrs/model/qo/DataDictQo.java index e3b68a0..b3b2c67 100644 --- a/src/main/java/com/xkrs/model/qo/DataDictQo.java +++ b/src/main/java/com/xkrs/model/qo/DataDictQo.java @@ -1,6 +1,7 @@ package com.xkrs.model.qo; import com.xkrs.model.validation.DataDictQoInsert; + import javax.validation.constraints.NotBlank; /** @@ -10,30 +11,33 @@ import javax.validation.constraints.NotBlank; public class DataDictQo { /** - * 中文名称 + * 质检项代码 */ - @NotBlank(message = "{DataDict.dictChineseName.blank}",groups={DataDictQoInsert.class}) - private String dictChineseName; + @NotBlank(message = "{DataDict.inspectionItemCode.blank}", groups = {DataDictQoInsert.class}) + private String inspectionItemCode; /** - * 英文变量值 + * 质检项名称 */ - @NotBlank(message = "{DataDict.dictEnglishName.blank}",groups={DataDictQoInsert.class}) - private String dictEnglishName; + @NotBlank(message = "{DataDict.inspectionItemName.blank}", groups = {DataDictQoInsert.class}) + private String inspectionItemName; - public String getDictChineseName() { - return dictChineseName; + public DataDictQo() { } - public void setDictChineseName(String dictChineseName) { - this.dictChineseName = dictChineseName; + public String getInspectionItemCode() { + return inspectionItemCode; } - public String getDictEnglishName() { - return dictEnglishName; + public void setInspectionItemCode(String inspectionItemCode) { + this.inspectionItemCode = inspectionItemCode; } - public void setDictEnglishName(String dictEnglishName) { - this.dictEnglishName = dictEnglishName; + public String getInspectionItemName() { + return inspectionItemName; + } + + public void setInspectionItemName(String inspectionItemName) { + this.inspectionItemName = inspectionItemName; } } diff --git a/src/main/java/com/xkrs/model/qo/DataDictUpdateQo.java b/src/main/java/com/xkrs/model/qo/DataDictUpdateQo.java index a6ef452..f463eba 100644 --- a/src/main/java/com/xkrs/model/qo/DataDictUpdateQo.java +++ b/src/main/java/com/xkrs/model/qo/DataDictUpdateQo.java @@ -10,14 +10,17 @@ import javax.validation.constraints.NotBlank; */ public class DataDictUpdateQo { - @NotBlank(message = "{DataDict.id.blank}",groups={DataDictUpdateQoUpdate.class}) + @NotBlank(message = "{DataDict.id.blank}", groups = {DataDictUpdateQoUpdate.class}) private Integer id; /** * 中文名称 */ - @NotBlank(message = "{DataDict.dictChineseName.blank}",groups={DataDictUpdateQoUpdate.class}) - private String dictChineseName; + @NotBlank(message = "{DataDict.inspectionItemName.blank}", groups = {DataDictUpdateQoUpdate.class}) + private String inspectionItemName; + + public DataDictUpdateQo() { + } public Integer getId() { return id; @@ -27,11 +30,11 @@ public class DataDictUpdateQo { this.id = id; } - public String getDictChineseName() { - return dictChineseName; + public String getInspectionItemName() { + return inspectionItemName; } - public void setDictChineseName(String dictChineseName) { - this.dictChineseName = dictChineseName; + public void setInspectionItemName(String inspectionItemName) { + this.inspectionItemName = inspectionItemName; } }