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/LimsHaocaiRukuZixiangEntity.java |  163 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 163 insertions(+), 0 deletions(-)

diff --git a/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsHaocaiRukuZixiangEntity.java b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsHaocaiRukuZixiangEntity.java
new file mode 100644
index 0000000..7be1c9c
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsHaocaiRukuZixiangEntity.java
@@ -0,0 +1,163 @@
+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.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鑰楁潗鍏ュ簱鎵规锛堟潯鐮侊級瀛愯〃瀹炰綋绫汇��
+ *
+ * <p>鍏ュ簱鎻愪氦鏃剁敱 {@link LimsHaocaiRukuEntity} 涓昏〃鐢熸垚锛氭瘡鏉¤褰曚娇鐢ㄧ嫭绔�
+ * {@code tiaoma_bianma}锛岄�愭潯浠� {@code bianhao = 鎵瑰彿-搴忓彿} 鍖哄垎銆�
+ * {@code f_foreign_id} 涓� {@code ruku_id} 閮藉瓨涓昏〃 f_id锛堝悗鑰呭吋瀹瑰湪绾胯〃鍗曪級銆�
+ */
+@Data
+@TableName("lims_haocai_ruku_zixiang")
+public class LimsHaocaiRukuZixiangEntity {
+
+    @TableId(value = "f_id")
+    @JsonProperty("f_id")
+    @JsonAlias("id")
+    private String id;
+
+    @TableField(value = "f_tenant_id", fill = FieldFill.INSERT_UPDATE)
+    private String tenantId;
+
+    /** 澶栭敭锛堜富琛� f_id锛� */
+    @TableField("f_foreign_id")
+    private String foreignId;
+
+    /** 鏉$爜缂栫爜 */
+    @TableField("tiaoma_bianma")
+    private String tiaomaBianma;
+
+    /** 缂栧彿锛堟潯鐮佺紪鐮�-搴忓彿锛� */
+    @TableField("bianhao")
+    private String bianhao;
+
+    /** 鍚嶇О */
+    @TableField("mingcheng")
+    private String mingcheng;
+
+    /** 鍒嗙被 */
+    @TableField("fenlei")
+    private String fenlei;
+
+    /** 瑙勬牸 */
+    @TableField("guige")
+    private String guige;
+
+    /** 鎬婚噺 */
+    @TableField("zongliang")
+    private String zongliang;
+
+    /** 鍓╀綑閲� */
+    @TableField("shengyuliang")
+    private String shengyuliang;
+
+    /** 鍗曚綅 */
+    @TableField("danwei")
+    private String danwei;
+
+    /** 瀛樻斁浣嶇疆 */
+    @TableField("cunfang_weizhi")
+    private String cunfangWeizhi;
+
+    /** 寮�鐡舵湁鏁堟湡 */
+    @TableField("kaiping_youxiaoqi")
+    private String kaipingYouxiaoqi;
+
+    /** 寮�鐡舵湁鏁堟湡鍗曚綅 */
+    @TableField("kaiping_youxiaoqi_danwei")
+    private String kaipingYouxiaoqiDanwei;
+
+    /** 鍏ュ簱鏃堕棿 */
+    @TableField("ruku_shijian")
+    private Date rukuShijian;
+
+    /** 鍏ュ簱浜� */
+    @TableField("ruku_ren")
+    private String rukuRen;
+
+    /** 瀹℃牳浜� */
+    @TableField("shenhe_ren")
+    private String shenheRen;
+
+    /** 寮�鐡舵棩鏈� */
+    @TableField("kaiping_riqi")
+    private Date kaipingRiqi;
+
+    /** 鏈夋晥鏈� */
+    @TableField("youxiaoqi")
+    private Date youxiaoqi;
+
+    /** 鐘舵�侊紙weichuku=鏈嚭搴擄級 */
+    @TableField("biz_status")
+    private String bizStatus;
+
+    /** 楠屾敹鐘舵�� */
+    @TableField("yanshou_zhuangtai")
+    private String yanshouZhuangtai;
+
+    /** 鑰楁潗涓婚敭 */
+    @TableField("haocai_id")
+    private String haocaiId;
+
+    /** 鍏ュ簱涓婚敭锛堜富琛� f_id锛屽湪绾胯〃鍗曞悓娆惧叧鑱斿垪锛� */
+    @TableField("ruku_id")
+    private String rukuId;
+
+    /** 鐢靛瓙绛惧悕 */
+    @TableField("biz_sign")
+    private String bizSign;
+
+    /** 鎵瑰彿 */
+    @TableField("pihao")
+    private String pihao;
+
+    /** 鏄惁鍙屼汉澶嶆牳鍑哄簱 */
+    @TableField("shifou_shuangren_chuku")
+    private String shifouShuangrenChuku;
+
+    /** 杞攢姣佷汉 */
+    @TableField("zhuanxiaohui_ren")
+    private String zhuanxiaohuiRen;
+
+    /** 閿�姣佸崟鍙� */
+    @TableField("xiaohui_danhao")
+    private String xiaohuiDanhao;
+
+    /** 娴佺▼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