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/HzProductEntryRecord.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/HzProductEntryRecord.java b/hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/HzProductEntryRecord.java
index 5201b65..8ce4de8 100644
--- a/hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/HzProductEntryRecord.java
+++ b/hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/HzProductEntryRecord.java
@@ -1,9 +1,6 @@
package com.gkhy.hazmat.system.domain;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.gkhy.hazmat.common.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
@@ -43,6 +40,11 @@
@TableField("warehouse_id")
private Long warehouseId;
+ @NotNull(message = "存储柜id不能为空")
+ @ApiModelProperty("存储柜id")
+ @TableField("cupboard_id")
+ private Long cupboardId;
+
@NotNull(message = "数量不能为空")
@ApiModelProperty("数量")
@TableField("num")
@@ -78,6 +80,7 @@
@TableField("company_id")
private Long companyId;
+ @Version
@TableField("version")
private Integer version;
@@ -88,4 +91,8 @@
@ApiModelProperty("仓库对象")
@TableField(exist = false)
private HzWarehouse warehouse;
+
+ @ApiModelProperty("存储柜对象")
+ @TableField(exist = false)
+ private HzWarehouseCupboard cupboard;
}
--
Gitblit v1.9.2