From 84f28e6743089c1147e078763de6eafe52d0dc31 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期三, 12 二月 2025 14:15:40 +0800 Subject: [PATCH] 解决冲突 --- medicalWaste-system/src/main/java/com/sinata/system/domain/SysDepartment.java | 23 ++++++++++++++++++++++- 1 files changed, 22 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 a8d9d52..8d0a308 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 @@ -89,5 +89,26 @@ @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