diff --git a/src/main/java/cn/lihongjie/coal/coalBlend/dto/CoalBlendDto.java b/src/main/java/cn/lihongjie/coal/coalBlend/dto/CoalBlendDto.java index dce9c0a5..791b02c7 100644 --- a/src/main/java/cn/lihongjie/coal/coalBlend/dto/CoalBlendDto.java +++ b/src/main/java/cn/lihongjie/coal/coalBlend/dto/CoalBlendDto.java @@ -1,9 +1,6 @@ package cn.lihongjie.coal.coalBlend.dto; -import cn.lihongjie.coal.coalBlend.entity.CoalBlendType; -import cn.lihongjie.coal.coalBlend.entity.CoalBlendCoalInfoEntity; -import cn.lihongjie.coal.coalBlend.entity.CoalBlendConstrainVo; -import cn.lihongjie.coal.coalBlend.entity.CoalParameterDefVo; +import cn.lihongjie.coal.coalBlend.entity.*; import cn.lihongjie.coal.base.dto.OrgCommonDto; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; @@ -30,7 +27,7 @@ public class CoalBlendDto extends OrgCommonDto { @NotNull(message = "约束条件不能为空") private CoalBlendConstrainVo constrains; - private List results; + private List results; @Enumerated(value = EnumType.STRING) @NotNull() diff --git a/src/main/java/cn/lihongjie/coal/coalBlend/dto/CreateCoalBlendDto.java b/src/main/java/cn/lihongjie/coal/coalBlend/dto/CreateCoalBlendDto.java index abc152a5..5acd9ea1 100644 --- a/src/main/java/cn/lihongjie/coal/coalBlend/dto/CreateCoalBlendDto.java +++ b/src/main/java/cn/lihongjie/coal/coalBlend/dto/CreateCoalBlendDto.java @@ -1,10 +1,7 @@ package cn.lihongjie.coal.coalBlend.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; -import cn.lihongjie.coal.coalBlend.entity.CoalBlendType; -import cn.lihongjie.coal.coalBlend.entity.CoalBlendCoalInfoEntity; -import cn.lihongjie.coal.coalBlend.entity.CoalBlendConstrainVo; -import cn.lihongjie.coal.coalBlend.entity.CoalParameterDefVo; +import cn.lihongjie.coal.coalBlend.entity.*; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import jakarta.validation.constraints.NotEmpty; @@ -30,7 +27,7 @@ public class CreateCoalBlendDto extends OrgCommonDto { @NotNull(message = "约束条件不能为空") private CoalBlendConstrainVo constrains; - private List results; + private List results; @Enumerated(value = EnumType.STRING) @NotNull() diff --git a/src/main/java/cn/lihongjie/coal/coalBlend/dto/UpdateCoalBlendDto.java b/src/main/java/cn/lihongjie/coal/coalBlend/dto/UpdateCoalBlendDto.java index 20c3306f..c8ffcc4c 100644 --- a/src/main/java/cn/lihongjie/coal/coalBlend/dto/UpdateCoalBlendDto.java +++ b/src/main/java/cn/lihongjie/coal/coalBlend/dto/UpdateCoalBlendDto.java @@ -1,10 +1,7 @@ package cn.lihongjie.coal.coalBlend.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; -import cn.lihongjie.coal.coalBlend.entity.CoalBlendType; -import cn.lihongjie.coal.coalBlend.entity.CoalBlendCoalInfoEntity; -import cn.lihongjie.coal.coalBlend.entity.CoalBlendConstrainVo; -import cn.lihongjie.coal.coalBlend.entity.CoalParameterDefVo; +import cn.lihongjie.coal.coalBlend.entity.*; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import jakarta.validation.constraints.NotEmpty; @@ -30,7 +27,7 @@ public class UpdateCoalBlendDto extends OrgCommonDto { @NotNull(message = "约束条件不能为空") private CoalBlendConstrainVo constrains; - private List results; + private List results; @Enumerated(value = EnumType.STRING) @NotNull() diff --git a/src/main/java/cn/lihongjie/coal/coalBlend/entity/CoalParameterDefVo.java b/src/main/java/cn/lihongjie/coal/coalBlend/entity/CoalParameterDefVo.java index 44b98666..84fc3c61 100644 --- a/src/main/java/cn/lihongjie/coal/coalBlend/entity/CoalParameterDefVo.java +++ b/src/main/java/cn/lihongjie/coal/coalBlend/entity/CoalParameterDefVo.java @@ -17,6 +17,9 @@ public class CoalParameterDefVo { @Comment("备注") private String remarks; + @Comment("备注") + private String parentName; + @Comment("排序键")