From 788b1abbdc75d6bc727be65fc107fb10eaa484b6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 30 七月 2024 20:04:10 +0800
Subject: [PATCH] 模版变更,下单的界面设置区间,如果填写0.48*0.5的时候筛选条件用0.48,下单的模版查看根据委托单位进行筛选,如果委托单位为空就可以查看所有
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureTestObject.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureTestObject.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureTestObject.java
index c85ec7c..b254027 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureTestObject.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureTestObject.java
@@ -1,15 +1,14 @@
package com.yuanchu.mom.pojo;
-import java.io.Serializable;
-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.time.LocalDateTime;
/**
* 妫�娴嬪璞�(StructureTestObject)琛ㄥ璞�
@@ -26,14 +25,15 @@
@ValueTableShow(1)
@ApiModelProperty(value = "鍦烘墍")
- private Integer laboratory;
-
- @TableField(exist = false)
- private Integer laboratory_id;
+ private Integer laboratoryId;
@ValueTableShow(1)
@ApiModelProperty(value = "妫�楠屽璞�")
private String specimenName;
+
+ @ValueTableShow(1)
+ @ApiModelProperty(value = "妫�楠屽璞N")
+ private String specimenNameEn;
@ValueTableShow(2)
@ApiModelProperty(value = "瀵硅薄浠ｅ彿")
@@ -47,7 +47,7 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ValueTableShow(3)
+ @ValueTableShow(4)
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
--
Gitblit v1.9.3