From f8a3a9826738a397bdf4aff4ca7a5116344b5a0a Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 09 五月 2024 07:26:56 +0800
Subject: [PATCH] 实现报告生成合并单元格；修复部分bug
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/StandardMethod.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StandardMethod.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StandardMethod.java
index dd18705..027375e 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StandardMethod.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StandardMethod.java
@@ -1,16 +1,14 @@
package com.yuanchu.mom.pojo;
import com.baomidou.mybatisplus.annotation.*;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.common.OrderBy;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
/**
* 鏍囧噯鏂规硶
@@ -28,11 +26,9 @@
@ValueTableShow(value = 1, name = "棰嗗煙")
private String field;
- private Integer structureTestObjectId;
-
@ValueTableShow(2)
@ApiModelProperty("妫�楠屽璞�")
- private String sampleType;
+ private String structureTestObjectId;
/**
* 鏍囧噯缂栧彿
--
Gitblit v1.9.3