From b434c283d2a4787b6eb840a0289d6adc62fba132 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 14 五月 2024 15:07:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java
index b9e8424..48ef8d5 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java
@@ -14,19 +14,21 @@
@Data
public class SampleOrderDto extends InsOrder {
- @ValueTableShow(5)
@ApiModelProperty("妫�楠屽璞�")
private String sampleType;
- @ValueTableShow(6)
+ @ValueTableShow(3)
@ApiModelProperty("鏍峰搧鍚嶇О")
private String sampleName;
- @ValueTableShow(6)
+ @ValueTableShow(4)
@ApiModelProperty("鏍峰搧鍨嬪彿")
private String sampleModel;
- @ValueTableShow(6)
+ @ValueTableShow(5)
+ @ApiModelProperty("鏍峰搧鏁伴噺")
+ private Integer sampleNum;
+
@ApiModelProperty("鏍峰搧缂栧彿")
private String sampleCode;
--
Gitblit v1.9.3