From 48bdd6d0b6c13c99dfc8ec5801d70a056d9db315 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期二, 04 三月 2025 10:43:52 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/hazmat_manage
---
hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/HzHazmatBasic.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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..4ac234e 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)
@@ -99,7 +101,7 @@
@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;
--
Gitblit v1.9.2