From 27421a34661fed2e141ab9aaa7447926aea46e36 Mon Sep 17 00:00:00 2001
From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com>
Date: 星期一, 27 五月 2024 14:09:25 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/StandardMethod.java | 14 +++++---------
1 files changed, 5 insertions(+), 9 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 3381c50..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;
/**
* 鏍囧噯缂栧彿
@@ -49,7 +45,7 @@
private String name;
@ValueTableShow(2)
- @ApiModelProperty(value = "鏍囧噯鎻忚堪(鑻辨枃)")
+ @ApiModelProperty(value = "鏍囧噯鎻忚堪EN")
private String nameEn;
/**
--
Gitblit v1.9.3