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

diff --git a/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsHaocaiRukuEntity.java b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsHaocaiRukuEntity.java
new file mode 100644
index 0000000..51b276f
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsHaocaiRukuEntity.java
@@ -0,0 +1,198 @@
+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 LimsHaocaiRukuZixiangEntity} 鏉$爜璁板綍锛�
+ * 骞跺洖鍐欐彁浜ゆ椂璁$畻寰楀埌鐨勭姸鎬佸瓧娈点��
+ */
+@Data
+@TableName("lims_haocai_ruku")
+public class LimsHaocaiRukuEntity {
+
+    @TableId(value = "f_id")
+    @JsonProperty("f_id")
+    @JsonAlias("id")
+    private String id;
+
+    @TableField(value = "f_tenant_id", fill = FieldFill.INSERT_UPDATE)
+    private String tenantId;
+
+    /** 鍒嗙被 */
+    @TableField("haocai_fenlei")
+    private String haocaiFenlei;
+
+    /** 鍚嶇О */
+    @TableField("haocai_mingcheng")
+    private String haocaiMingcheng;
+
+    /** 鎵瑰彿 */
+    @TableField("pihao")
+    private String pihao;
+
+    /** 鍏ュ簱鏁伴噺 */
+    @TableField("ruku_shuliang")
+    private String rukuShuliang;
+
+    /** 鍏ュ簱鍗曚綅 */
+    @TableField("ruku_danwei")
+    private String rukuDanwei;
+
+    /** 瀛樻斁浣嶇疆 */
+    @TableField("cunfang_weizhi")
+    private String cunfangWeizhi;
+
+    /** 淇濆瓨鏉′欢 */
+    @TableField("baocun_tiaojian")
+    private String baocunTiaojian;
+
+    /** 鏈夋晥鏈� */
+    @TableField("youxiaoqi")
+    private Date youxiaoqi;
+
+    /** 瀹归噺 */
+    @TableField("rongliang")
+    private String rongliang;
+
+    /** 瀹归噺鍗曚綅 */
+    @TableField("rongliang_danwei")
+    private String rongliangDanwei;
+
+    /** 鐢熶骇鍟嗗悕绉� */
+    @TableField("changshang")
+    private String changshang;
+
+    /** 鐢熶骇鍦板潃 */
+    @TableField("shengchan_dizhi")
+    private String shengchanDizhi;
+
+    /** 渚涘簲鍟� */
+    @TableField("gongyingshang")
+    private String gongyingshang;
+
+    /** 鐗╂枡浠g爜 */
+    @TableField("wuliao_daima")
+    private String wuliaoDaima;
+
+    /** 璐у彿 */
+    @TableField("huohao")
+    private String huohao;
+
+    /** 瑙勬牸 */
+    @TableField("guige")
+    private String guige;
+
+    /** 鍚噺 */
+    @TableField("hanliang")
+    private String hanliang;
+
+    /** 鏉ユ簮 */
+    @TableField("laiyuan")
+    private String laiyuan;
+
+    /** 鏄惁涓�涓潯鐮侊紙yes/no锛� */
+    @TableField("shifou_yige_tiaoma")
+    private String shifouYigeTiaoma;
+
+    /** 鏄惁鍚敤楠屾敹 */
+    @TableField("shifou_qiyong_yanshou")
+    private String shifouQiyongYanshou;
+
+    /** 楠屾敹鐘舵�� */
+    @TableField("yanshou_zhuangtai")
+    private String yanshouZhuangtai;
+
+    /** 鍏宠仈鐨勫叆搴撻獙鏀惰褰曚富閿� */
+    @TableField("yanshou_id")
+    private String yanshouId;
+
+    /** 鏄惁鍙屼汉鍏ュ簱 */
+    @TableField("shifou_shuangren_ruku")
+    private String shifouShuangrenRuku;
+
+    /** 鏄惁鍙屼汉澶嶆牳鍑哄簱 */
+    @TableField("shifou_shuangren_chuku")
+    private String shifouShuangrenChuku;
+
+    /** 鑰楁潗涓婚敭 */
+    @TableField("haocai_id")
+    private String haocaiId;
+
+    /** 寮�鐡舵湁鏁堟湡 */
+    @TableField("kaiping_youxiaoqi")
+    private String kaipingYouxiaoqi;
+
+    /** 寮�鐡舵湁鏁堟湡鍗曚綅 */
+    @TableField("kaiping_youxiaoqi_danwei")
+    private String kaipingYouxiaoqiDanwei;
+
+    /** 澶囨敞 */
+    @TableField("beizhu")
+    private String beizhu;
+
+    /** 鍏ュ簱浜� */
+    @TableField("ruku_ren")
+    private String rukuRen;
+
+    /** 鍏ュ簱鏃堕棿 */
+    @TableField("ruku_shijian")
+    private Date rukuShijian;
+
+    /** 瀹℃牳浜� */
+    @TableField("shenhe_ren")
+    private String shenheRen;
+
+    /** 鐢靛瓙绛惧悕 */
+    @TableField("biz_sign")
+    private String bizSign;
+
+    /** 瀹℃牳浜虹鍚� */
+    @TableField("shenhe_ren_qianming")
+    private String shenheRenQianming;
+
+    /** 缁撲綑鏁伴噺 */
+    @TableField("jieyu_shuliang")
+    private String jieyuShuliang;
+
+    /** 涓氬姟鐘舵�侊紙鑰楁潗鍏ュ簱鐘舵�佸瓧鍏革級 */
+    @TableField("biz_status")
+    private String bizStatus;
+
+    /** 娴佺▼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