From 488b9158fc873d228c2c0106050ece8272a49653 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 25 十二月 2024 10:36:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 medicalWaste-system/src/main/java/com/sinata/system/domain/MwWarningRecord.java |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/MwWarningRecord.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/MwWarningRecord.java
index c162a5f..b32cb8b 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/MwWarningRecord.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/MwWarningRecord.java
@@ -44,7 +44,9 @@
     @TableField("WARNING_TARGET_NAME")
     private String warningTargetName;
 
-    @ApiModelProperty("预警类型 1:医疗废物预警 2:合同预警 3:人员预警 4:职业防护预警 5:入库暂存间存储容量预警")
+    @ApiModelProperty("预警类型 预警类型 1:出库超时预警 2:暂存间使用率预警 3:合同到期预警 4:健康记录预警 " +
+            "5:疫苗记录预警 6:防护用品使用预警 7:医疗机构产废日预警  8:医疗机构产废月预警 " +
+            "9:医疗机构存储量预警 10:车辆转运异常预警 11:处置单位存储量预警")
     @TableField("TYPE")
     private Integer type;
 
@@ -56,5 +58,19 @@
     @TableField("STATUS")
     private Integer status;
 
+    @ApiModelProperty("单位id")
+    @TableField("DEPARTMENT_ID")
+    private Long departmentId;
 
+    @ApiModelProperty("单位名称")
+    @TableField("DEPARTMENT_NAME")
+    private String departmentName;
+
+    @ApiModelProperty("预警值")
+    @TableField("CURRENT_VALUE")
+    private String currentValue;
+
+    @ApiModelProperty("正常范围")
+    @TableField("NORMAL_RANGE")
+    private String normalRange;
 }

--
Gitblit v1.7.1