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/StandardMethod.java | 16 +++++++--------- 1 files changed, 7 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..56c8118 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; /** @@ -81,10 +77,12 @@ @ValueTableShow(7) @ApiModelProperty(value = "鍒涘缓浜�") + @TableField(exist = false,select = false) private String createUserName; @ValueTableShow(9) @ApiModelProperty(value = "鏇存柊浜�") + @TableField(exist = false,select = false) private String updateUserName; @ValueTableShow(8) -- Gitblit v1.9.3