From b44b174f656aac1fe03e7f96851e564c3982f67d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 28 三月 2025 16:52:25 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/boymi/YiFeiNN
---
medicalWaste-system/src/main/java/com/sinata/system/domain/query/StorageRecordQuery.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/query/StorageRecordQuery.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/query/StorageRecordQuery.java
index 1893024..2a14f8f 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/query/StorageRecordQuery.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/query/StorageRecordQuery.java
@@ -19,10 +19,10 @@
private static final long serialVersionUID = 3037481981686862175L;
- @ApiModelProperty("机构id")
+ @ApiModelProperty(value = "机构id", notes = "机构id和暂存间id只需传其中一个")
private Long departmentId;
- @ApiModelProperty("暂存间id")
+ @ApiModelProperty(value = "暂存间id", notes = "机构id和暂存间id只需传其中一个")
private Long stagingRoomId;
@ApiModelProperty("医废编号")
@@ -34,6 +34,12 @@
@ApiModelProperty("医废类型")
private Integer wasteType;
- @ApiModelProperty("入库时间")
- private Date collectTime;
+ @ApiModelProperty("入库时间-开始")
+ private Date collectTimeStart;
+
+ @ApiModelProperty("入库时间-结束")
+ private Date collectTimeEnd;
+
+ @ApiModelProperty("医废状态 1：暂存中 2：运输中 3：已接收 4：已处置")
+ private Integer status;
}
--
Gitblit v1.7.1