From 196ac84b6ec0dd05304dd6577f169f7fbf5fe726 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 01 一月 2025 10:13:18 +0800
Subject: [PATCH] merge

---
 medicalWaste-system/src/main/java/com/sinata/system/domain/SysDepartment.java |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/SysDepartment.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/SysDepartment.java
index c41be07..3af2f23 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/SysDepartment.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/SysDepartment.java
@@ -36,7 +36,7 @@
 
     @ApiModelProperty("上级区域id")
     @TableField("PARENT_ID")
-    private Integer parentId;
+    private Long parentId;
 
     @ApiModelProperty("树编码")
     @TableField("TREE_CODE")
@@ -82,5 +82,29 @@
     @TableField("UNIFIED_SOCIAL_CREDIT_CODE")
     private String unifiedSocialCreditCode;
 
+    @ApiModelProperty("区域")
+    @TableField("REGION")
+    private String region;
+    @ApiModelProperty("医院-暂存间最大数量")
+    @TableField(exist = false)
+    private Integer maxCapacity;
 
+    @ApiModelProperty("医院-现在存入数量")
+    @TableField(exist = false)
+    private Integer nowCapacity;
+    @ApiModelProperty("医院-百分比")
+    @TableField(exist = false)
+    private String percentage;
+    @ApiModelProperty("处置-库存总")
+    @TableField(exist = false)
+    private Long cont1;
+    @ApiModelProperty("处置-今日接收")
+    @TableField(exist = false)
+    private Long cont2;
+    @ApiModelProperty("处置-今日处置")
+    @TableField(exist = false)
+    private Long cont3;
+    @ApiModelProperty("当前预警量")
+    @TableField(exist = false)
+    private Long dangerCount;
 }

--
Gitblit v1.7.1