diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAddParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAddParm.java index 6eb4918..a0cd6ff 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAddParm.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAddParm.java @@ -19,12 +19,6 @@ import javax.validation.constraints.NotBlank; @Data public class CsDevModelAddParm { - /** - * 装置型号(字典数据) - */ - @ApiModelProperty(value = "装置型号") - private String devType; - @ApiModelProperty(value = "装置型号") @NotBlank(message="装置型号名称不能为空!") private String devTypeName; diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAuditParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAuditParm.java index bbd59c6..85d5dfc 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAuditParm.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAuditParm.java @@ -23,11 +23,7 @@ import java.util.Date; public class CsDevModelAuditParm { @NotNull(message="版本id不能为空!") private String id; - /** - * 装置型号(字典数据) - */ - @ApiModelProperty(value = "装置型号") - private String devType; + @ApiModelProperty(value = "装置型号") private String devTypeName; @ApiModelProperty(value = "模板名称") diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelQueryListParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelQueryListParm.java index 9555ba3..17fd046 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelQueryListParm.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelQueryListParm.java @@ -19,13 +19,6 @@ import org.springframework.format.annotation.DateTimeFormat; @Data public class CsDevModelQueryListParm { - - /** - * 装置型号(字典数据) - */ - @ApiModelProperty(value = "装置模板型号") - private String devType; - @ApiModelProperty(value = "装置模板型号名称") private String devName; @ApiModelProperty(value = "模板名称") diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelQueryParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelQueryParm.java index 0ce1b5d..a193230 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelQueryParm.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelQueryParm.java @@ -30,11 +30,6 @@ public class CsDevModelQueryParm { @NotNull(message="显示条数不能为空!") @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true) private Integer pageSize; - /** - * 装置型号(字典数据) - */ - @ApiModelProperty(value = "装置模板型号") - private String devType; @ApiModelProperty(value = "装置模板型号名称") private String devName; @ApiModelProperty(value = "模板名称") diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelPO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelPO.java index 543ee9b..fee4bd0 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelPO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelPO.java @@ -34,12 +34,6 @@ public class CsDevModelPO extends BaseEntity { @TableId(value = "id",type = IdType.ASSIGN_UUID) private String id; - /** - * 装置型号(字典数据) - */ - @TableField(value = "dev_type") - private String devType; - @TableField(value = "dev_type_name") private String devTypeName;