From 55d7987024ec302f27b58d75c6788ff8e04df636 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 07 八月 2024 11:26:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java | 35 +++++++++++------------------------
1 files changed, 11 insertions(+), 24 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java
index bf088aa..eefacfc 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java
@@ -1,15 +1,12 @@
package com.yuanchu.mom.pojo;
import com.baomidou.mybatisplus.annotation.*;
-
-import java.io.Serializable;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.Date;
-
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
/**
* 妫�楠屾牱鍝�
@@ -80,21 +77,9 @@
private String model;
/**
- * 鏄惁鐣欐牱 1锛氱暀鏍� 0锛氫笉鐣欐牱
- */
- private Integer isLeave;
-
- /**
* 妫�楠岀姸鎬�(0锛氬緟妫�楠�1:妫�楠屼腑 2:宸叉楠�3锛氬緟澶嶆牳4锛氬鏍告湭閫氳繃5锛氬鏍搁�氳繃)
*/
private Integer insState;
-
- /**
- * 涓嬪彂鏃堕棿
- */
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime sendTime;
/**
* 澶囨敞
@@ -103,14 +88,10 @@
private Integer standardMethodListId;
- /**
- * 绾﹀畾鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- private LocalDate appointed;
-
@ApiModelProperty("鏍峰搧鍗曚綅")
private String unit;
+
+ private Integer cellId;
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
@@ -127,4 +108,10 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
+
+ private Integer parentId;
+
+ @TableField(select = false,exist = false)
+ private Integer num=1;
+
}
\ No newline at end of file
--
Gitblit v1.9.3