From 1f15333b0a97a327865f7aab8f1e3f9ba8fc16f8 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期五, 18 十月 2024 12:45:59 +0800 Subject: [PATCH] 电路站点报告调试+总报告ing --- inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java | 37 +++++++++++++++++++++++++++++++------ 1 files changed, 31 insertions(+), 6 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 2960fa8..82063bf 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,13 +1,10 @@ package com.yuanchu.mom.dto; -import com.fasterxml.jackson.annotation.JsonFormat; +import com.baomidou.mybatisplus.annotation.TableField; import com.yuanchu.mom.annotation.ValueTableShow; import com.yuanchu.mom.pojo.InsOrder; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - -import java.time.LocalDate; -import java.time.LocalDateTime; /** * @author gaoaoy @@ -17,9 +14,30 @@ @Data public class SampleOrderDto extends InsOrder { - @ValueTableShow(5) - @ApiModelProperty("鏍峰搧绫诲瀷") + @ApiModelProperty("妫�楠屽璞�") private String sampleType; + + @ValueTableShow(3) + @ApiModelProperty("鏍峰搧鍚嶇О") + private String sampleName; + + @ValueTableShow(4) + @ApiModelProperty("鏍峰搧鍨嬪彿") + private String sampleModel; + + private String assign; + + @ValueTableShow(5) + @ApiModelProperty("鏍峰搧鏁伴噺") + private Integer sampleNum; + + @ValueTableShow(3) + @ApiModelProperty("鏍峰搧缂栧彿") + private String sampleCode; + + @ValueTableShow(3) + @ApiModelProperty("鐢垫満缂栧彿") + private String motorNumber; @ValueTableShow(7) @ApiModelProperty("妫�楠岃繘搴�%") @@ -28,4 +46,11 @@ @ApiModelProperty("鎶ュ憡id") private String reportId; + @TableField("`url`") + private String url; + + private String urlS; + + private String name; + } -- Gitblit v1.9.3