From f8a3a9826738a397bdf4aff4ca7a5116344b5a0a Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 09 五月 2024 07:26:56 +0800
Subject: [PATCH] 实现报告生成合并单元格；修复部分bug
---
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java | 18 +++++++++++++-----
1 files changed, 13 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..750ee10 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,9 @@
package com.yuanchu.mom.dto;
-import com.fasterxml.jackson.annotation.JsonFormat;
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,9 +14,21 @@
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("妫�楠岃繘搴�%")
private String insProgress;
--
Gitblit v1.9.3