From 11af23e0c7976eed1211ba2ca0beae3a12e19310 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期三, 12 三月 2025 15:37:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java |  123 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 123 insertions(+), 0 deletions(-)

diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java
new file mode 100644
index 0000000..8d8254b
--- /dev/null
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java
@@ -0,0 +1,123 @@
+package com.ruoyi.inspect.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 妫�楠屾牱鍝�
+ * @TableName ins_sample
+ */
+@TableName(value ="ins_sample")
+@Data
+public class InsSample implements Serializable {
+    /**
+     *
+     */
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 1锛氬悎鏍� 0锛氫笉鍚堟牸
+     */
+    private Integer insResult;
+
+    /**
+     * 澶栭敭锛歩ns_order琛╥d
+     */
+    private Integer insOrderId;
+
+    /**
+     * 閰嶅鏍峰搧鍨嬪彿
+     */
+    private String joinModel;
+
+    /**
+     * 閰嶅鏍峰搧鍚嶇О
+     */
+    private String joinName;
+
+    /**
+     * 閰嶅鏍峰搧鏁伴噺
+     */
+    private Integer joinNum;
+
+    /**
+     * 鏍峰搧缂栫爜
+     */
+    private String sampleCode;
+
+    /**
+     * 妫�楠屽伐鍘�
+     */
+    private String factory;
+
+    /**
+     * 瀹為獙瀹ゅ悕绉�
+     */
+    private String laboratory;
+
+    /**
+     * 鏍峰搧绫诲瀷
+     */
+    private String sampleType;
+
+    /**
+     * 鏍峰搧鍚嶇О
+     */
+    private String sample;
+
+    /**
+     * 瑙勬牸鍨嬪彿
+     */
+    private String model;
+
+    /**
+     * 妫�楠岀姸鎬�(0锛氬緟妫�楠�1:妫�楠屼腑 2:宸叉楠�3锛氬緟澶嶆牳4锛氬鏍告湭閫氳繃5锛氬鏍搁�氳繃)
+     */
+    private Integer insState;
+
+    /**
+     * 澶囨敞
+     */
+    private String remark;
+
+    private Integer standardMethodListId;
+
+    @ApiModelProperty("鏍峰搧鍗曚綅")
+    private String unit;
+
+    private Integer cellId;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Integer createUser;
+
+    @ApiModelProperty("鍒涘缓鏃堕棿")
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Integer updateUser;
+
+    @ApiModelProperty("淇敼鏃堕棿")
+    @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;
+
+    /**
+     * 鏄惁涓虹啍鎺ユ崯鑰楃壒娈婇」鐢熸垚鐨勬牱鍝佺粍鍚�(0:鍚� 1:鏄�)
+     */
+    @ApiModelProperty("鏄惁涓虹啍鎺ユ崯鑰楃壒娈婇」鐢熸垚鐨勬牱鍝佺粍鍚�(0:鍚� 1:鏄�)")
+    private String isPairing;
+
+}

--
Gitblit v1.9.3