From cf49f4f936a11b27de3f9ec3cbb50603f3b1cd5b Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期六, 28 十二月 2024 16:16:18 +0800 Subject: [PATCH] merge --- medicalWaste-system/src/main/java/com/sinata/system/domain/query/StorageRecordQuery.java | 11 +++++++---- 1 files changed, 7 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..3d19930 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,9 @@ @ApiModelProperty("医废类型") private Integer wasteType; - @ApiModelProperty("入库时间") - private Date collectTime; + @ApiModelProperty("入库时间-开始") + private Date collectTimeStart; + + @ApiModelProperty("入库时间-结束") + private Date collectTimeEnd; } -- Gitblit v1.7.1