From ee6692dc41439b6213c226d21d8286ba17cb7e43 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 01 五月 2024 10:13:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java | 23 +++++------------------
1 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
index 4ce5560..7f9a25b 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
@@ -1,16 +1,15 @@
package com.yuanchu.mom.pojo;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.Date;
-
import com.baomidou.mybatisplus.annotation.*;
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.math.BigDecimal;
+import java.time.LocalDateTime;
/**
* 妫�楠岄」鐩弬鏁�(StructureItemParameter)琛ㄥ璞�
@@ -33,10 +32,6 @@
@ApiModelProperty(value = "妫�楠岄」EN")
private String inspectionItemEn;
-// @ValueTableShow(2)
-// @ApiModelProperty(value = "妫�楠屽垎绫�")
-// private String inspectionItemClassify;
-
@ValueTableShow(3)
@ApiModelProperty(value = "妫�楠屽瓙椤�")
private String inspectionItemSubclass;
@@ -47,13 +42,12 @@
@ValueTableShow(3)
@ApiModelProperty(value = "妫�楠屽璞�")
- private Integer sample;
+ private String sample;
@ValueTableShow(4)
@ApiModelProperty(value = "鍗曚环(鍏�)")
private BigDecimal price;
- @ValueTableShow(4)
@ApiModelProperty(value = "瀹為獙瀹�")
private String laboratory;
@@ -97,19 +91,12 @@
@ApiModelProperty(value = "妫�楠屽�肩被鍨�")
private String inspectionValueType;
- @ApiModelProperty(value = "璁惧缁�")
- private String deviceGroup;
-
@ApiModelProperty(value = "妫�楠屾鏁�")
private Integer checkoutNumber;
@ValueTableShow(12)
@ApiModelProperty(value = "鍖洪棿")
private String section;
-
- /*@ValueTableShow(13)
- @ApiModelProperty(value = "鍙栧�肩被鍨�")
- private String valueType;*/
@ValueTableShow(13)
@ApiModelProperty(value = "鐗规畩鏍囪瘑")
--
Gitblit v1.9.3