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/vo/HzTabooWarningVO.java | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/vo/HzTabooWarningVO.java b/hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/vo/HzTabooWarningVO.java index e4e6486..d548e85 100644 --- a/hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/vo/HzTabooWarningVO.java +++ b/hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/vo/HzTabooWarningVO.java @@ -32,16 +32,16 @@ @ApiModelProperty("状态(0未处理,1已处理)") private Integer state; - @ApiModelProperty(value = "仓库id") + @ApiModelProperty(value = "原仓库id") private Long warehouseId; - @ApiModelProperty(value = "仓库名称") + @ApiModelProperty(value = "原仓库名称") private String warehouseName; - @ApiModelProperty(value = "存储柜Id") + @ApiModelProperty(value = "原存储柜Id") private Long cupboardId; - @ApiModelProperty(value = "存储柜") + @ApiModelProperty(value = "原存储柜") private String cupboardName; @ApiModelProperty("危化品基础数据id") @@ -66,4 +66,15 @@ @ApiModelProperty("备注") private String remark; + + @ApiModelProperty(value = "新仓库id",required = false) + private Long reWarehouseId; + + @ApiModelProperty(value = "新存储柜Id",required = false) + private Long reCupboardId; + + @ApiModelProperty(value = "新仓库名称") + private String reWarehouseName; + @ApiModelProperty(value = "新存储柜") + private String reCupboardName; } -- Gitblit v1.9.2