From b0b8ca4b383c5c3a2373200ca1872c20ee9ff999 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 30 八月 2023 14:50:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/SelectMeteringPlanDto.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/SelectMeteringPlanDto.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/SelectMeteringPlanDto.java
index 7b5b716..a327be4 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/SelectMeteringPlanDto.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/SelectMeteringPlanDto.java
@@ -18,12 +18,10 @@
@ApiModelProperty(value = "褰撳墠椤�", example = "1", required = true)
private Long currentPage;
+
@ApiModelProperty(value = "姣忛〉澶氬皯鏉�", example = "10", required = true)
private Long pageSize;
- @ApiModelProperty(value = "浠櫒缂栫爜", required = false)
- private String code;
- @ApiModelProperty(value = "浠櫒鍚嶇О", required = false)
- private String name;
- @ApiModelProperty(value = "璁￠噺鍗曚綅", required = false)
- private String unit;
+
+ @ApiModelProperty(value = "璁″垝鍗曞彿", required = false)
+ private String plannedOrderNumber;
}
--
Gitblit v1.9.3