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/HzTabooWarning.java | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/HzTabooWarning.java b/hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/HzTabooWarning.java index 0f54bbe..7ae7040 100644 --- a/hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/HzTabooWarning.java +++ b/hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/HzTabooWarning.java @@ -52,10 +52,12 @@ @TableField("taboo_basic_id") private Long tabooBasicId; - @ApiModelProperty(value = "仓库id",required = true) + @ApiModelProperty(value = "源仓库id",required = true) + @TableField("warehouse_id") private Long warehouseId; - @ApiModelProperty(value = "存储柜Id",required = true) + @ApiModelProperty(value = "源存储柜Id",required = true) + @TableField("cupboard_id") private Long cupboardId; // @ApiModelProperty("相忌危化品表数据id") @@ -95,4 +97,13 @@ @ApiModelProperty("备注") @TableField("remark") private String remark; + + + @ApiModelProperty(value = "新仓库id",required = false) + @TableField("re_warehouse_id") + private Long reWarehouseId; + + @ApiModelProperty(value = "新存储柜Id",required = false) + @TableField("re_cupboard_id") + private Long reCupboardId; } -- Gitblit v1.9.2