From 34981c30a78e8bbd7791131059a9210f9928b62c Mon Sep 17 00:00:00 2001
From: 刘光辉 <347230014@qq.com>
Date: 星期四, 17 九月 2026 09:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsJieyangTuihuiEntity.java |   85 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 85 insertions(+), 0 deletions(-)

diff --git a/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsJieyangTuihuiEntity.java b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsJieyangTuihuiEntity.java
new file mode 100644
index 0000000..0c4e67d
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsJieyangTuihuiEntity.java
@@ -0,0 +1,85 @@
+package jnpf.limsEntity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鏍峰搧閫�鍥炲疄浣撶被锛堢彮缁勬牱鍝佺鐞� - 鏍峰搧閫�鍥炲脊绐楋級
+ */
+@Data
+@TableName("lims_jieyang_tuihui")
+public class LimsJieyangTuihuiEntity {
+
+    @TableId(value = "f_id")
+    @JsonProperty("f_id")
+    private String id;
+
+    @TableField(value = "f_tenant_id", fill = FieldFill.INSERT_UPDATE)
+    private String tenantId;
+
+    /** 鍙��鍥炴暟閲� */
+    @TableField("ketuihui_shuliang")
+    private String ketuihuiShuliang;
+
+    /** 閫�鍥炴暟閲� */
+    @TableField("tuihui_shuliang")
+    private String tuihuiShuliang;
+
+    /** 瀛樺叆浜� */
+    @TableField("cunru_ren")
+    private String cunruRen;
+
+    /** 瀛樺叆鏃堕棿 */
+    @TableField("cunru_shijian")
+    private Date cunruShijian;
+
+    /** 缁撲綑鏁伴噺 */
+    @TableField("jieyu_shuliang")
+    private String jieyuShuliang;
+
+    /** 澶囨敞 */
+    @TableField("beizhu")
+    private String beizhu;
+
+    /** 妫�楠屾祦姘村彿 */
+    @TableField("jianyan_liushuihao")
+    private String jianyanLiushuihao;
+
+    /** 鎺ユ牱鐝粍 f_id锛堝叧鑱� lims_jieyang_banzu.f_id锛� */
+    @TableField("jieyang_banzu_id")
+    private String jieyangBanzuId;
+
+    /** 娴佺▼id */
+    @TableField("f_flow_id")
+    private String flowId;
+
+    /** 涔愯閿� */
+    @TableField("f_version")
+    private Integer version;
+
+    /** 娴佺▼浠诲姟涓婚敭 */
+    @TableField("f_flow_task_id")
+    private String flowTaskId;
+
+    /** 娴佺▼浠诲姟鐘舵�� */
+    @TableField("f_flow_state")
+    private Integer flowState;
+
+    /** 鍒犻櫎鏍囧織 */
+    @TableField("f_delete_mark")
+    private Integer deleteMark;
+
+    /** 鍒犻櫎鏃堕棿 */
+    @TableField("f_delete_time")
+    private Date deleteTime;
+
+    /** 鍒犻櫎鐢ㄦ埛 */
+    @TableField("f_delete_user_id")
+    private String deleteUserId;
+}

--
Gitblit v1.8.0