From c04f2d4a58bd72449b2212ed2f8b0c3ac9ec96be Mon Sep 17 00:00:00 2001 From: “djh” <“3298565835@qq.com”> Date: 星期二, 12 八月 2025 11:04:16 +0800 Subject: [PATCH] 修改 --- hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/HzHazmatBasic.java | 37 ++++++++++++++++++++++++++++++------- 1 files changed, 30 insertions(+), 7 deletions(-) diff --git a/hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/HzHazmatBasic.java b/hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/HzHazmatBasic.java index e44a5a7..dbb68db 100644 --- a/hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/HzHazmatBasic.java +++ b/hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/HzHazmatBasic.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; +import lombok.experimental.Accessors; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -25,6 +26,7 @@ */ @Getter @Setter +@Accessors(chain = true) @TableName("hz_hazmat_basic") @ApiModel(value = "HzHazmatBasic对象", description = "危化品基础数据表") @JsonInclude(NON_NULL) @@ -59,13 +61,13 @@ @TableField("hazmat_character") private String hazmatCharacter; - @NotBlank(message = "供应商不能为空") - @ApiModelProperty(value = "供应商",required = true) + + @ApiModelProperty(value = "供应商") @TableField("supplier") private String supplier; - @NotBlank(message = "厂家不能为空") - @ApiModelProperty(value = "厂家",required = true) + + @ApiModelProperty(value = "厂家") @TableField("manufacturer") private String manufacturer; @@ -94,12 +96,12 @@ @TableField("unit") private String unit; - @NotNull(message = "含税价格不能为空") - @ApiModelProperty(value = "含税价格",required = true) + + @ApiModelProperty(value = "含税价格") @TableField("price") private BigDecimal price; - @NotNull(message = "每箱数量不能为空") + // @NotNull(message = "每箱数量不能为空") @ApiModelProperty(value = "每箱数量",required = true) @TableField("per_box") private Integer perBox; @@ -123,6 +125,14 @@ @TableField("del_flag") private Integer delFlag; + @ApiModelProperty("危化品特性种类") + @TableField("peculiarity_type") + private String peculiarityType; + + @ApiModelProperty("危化品特性编码") + @TableField("peculiarity_number") + private Integer peculiarityNumber; + @ApiModelProperty("创建人") @TableField("create_by") private String createBy; @@ -143,6 +153,10 @@ @TableField("remark") private String remark; + @ApiModelProperty("单次入库最大数量") + @TableField("max_entry") + private Integer maxEntry; + @Version @TableField("version") private Integer version; @@ -151,5 +165,14 @@ @TableField(exist = false) private String companyName; + @ApiModelProperty("危化品特性类别") + @TableField(exist = false) + private String riskType; + + @ApiModelProperty("危化品分类信息id") + @TableField("secientific_id") + private Integer secientificId; + + } -- Gitblit v1.9.2