From bf233b9eeb959091831bf0b9a11a180fee2b2d51 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 09 八月 2024 18:44:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java | 21 +++++++++++++++++----
1 files changed, 17 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 750ee10..84338ac 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
@@ -1,5 +1,6 @@
package com.yuanchu.mom.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.pojo.InsOrder;
import io.swagger.annotations.ApiModelProperty;
@@ -13,19 +14,24 @@
@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)
+ private String assign;
+
+ @ValueTableShow(5)
+ @ApiModelProperty("鏍峰搧鏁伴噺")
+ private Integer sampleNum;
+
+ @ValueTableShow(3)
@ApiModelProperty("鏍峰搧缂栧彿")
private String sampleCode;
@@ -36,4 +42,11 @@
@ApiModelProperty("鎶ュ憡id")
private String reportId;
+ @TableField("`url`")
+ private String url;
+
+ private String urlS;
+
+ private String name;
+
}
--
Gitblit v1.9.3