From 11d87814ebdb8863b1a88b835d5a7d33e2c32928 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 13 五月 2024 14:55:55 +0800
Subject: [PATCH] 报告合并单元格报错解决； 检验单查询增加报告地址内容
---
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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..b9e8424 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
@@ -18,8 +15,20 @@
public class SampleOrderDto extends InsOrder {
@ValueTableShow(5)
- @ApiModelProperty("鏍峰搧绫诲瀷")
+ @ApiModelProperty("妫�楠屽璞�")
private String sampleType;
+
+ @ValueTableShow(6)
+ @ApiModelProperty("鏍峰搧鍚嶇О")
+ private String sampleName;
+
+ @ValueTableShow(6)
+ @ApiModelProperty("鏍峰搧鍨嬪彿")
+ private String sampleModel;
+
+ @ValueTableShow(6)
+ @ApiModelProperty("鏍峰搧缂栧彿")
+ private String sampleCode;
@ValueTableShow(7)
@ApiModelProperty("妫�楠岃繘搴�%")
@@ -28,4 +37,9 @@
@ApiModelProperty("鎶ュ憡id")
private String reportId;
+ @TableField("`url`")
+ private String url;
+
+ private String urlS;
+
}
--
Gitblit v1.9.3