From a09e361bfcb68a809e9143eca87bed2d66af2216 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 25 Nov 2024 11:35:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/yw/entity/EmergencySuppliesEntity.java |   24 ++++++++++--------------
 1 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/springblade/modules/yw/entity/EmergencySuppliesEntity.java b/src/main/java/org/springblade/modules/yw/entity/EmergencySuppliesEntity.java
index d5c4019..186b375 100644
--- a/src/main/java/org/springblade/modules/yw/entity/EmergencySuppliesEntity.java
+++ b/src/main/java/org/springblade/modules/yw/entity/EmergencySuppliesEntity.java
@@ -52,21 +52,27 @@
 	 */
 	@ApiModelProperty(value = "应急物资名称")
 	private String name;
+
+	/**
+	 * 应急物资类型
+	 */
+	@ApiModelProperty(value = "应急物资类型")
+	private Integer type;
 	/**
 	 * 数量
 	 */
 	@ApiModelProperty(value = "数量")
-	private Integer number;
+	private String num;
 	/**
 	 * 单位
 	 */
 	@ApiModelProperty(value = "单位")
-	private String unit;
+	private Integer unit;
 	/**
 	 * 位置
 	 */
-	@ApiModelProperty(value = "位置")
-	private String address;
+	@ApiModelProperty(value = "存储位置")
+	private String stoLoc;
 	/**
 	 * 物资库id
 	 */
@@ -82,16 +88,6 @@
 	 */
 	@ApiModelProperty(value = "所属企业id")
 	private Long firmId;
-	/**
-	 * 责任人姓名
-	 */
-	@ApiModelProperty(value = "责任人姓名")
-	private String personInCha;
-	/**
-	 * 责任人电话
-	 */
-	@ApiModelProperty(value = "责任人电话")
-	private String personInChaPhone;
 
 	/**
 	 * 创建人

--
Gitblit v1.9.3