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

diff --git a/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/YangpinGuanliEntity.java b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/YangpinGuanliEntity.java
new file mode 100644
index 0000000..bd5104f
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/YangpinGuanliEntity.java
@@ -0,0 +1,165 @@
+package jnpf.limsEntity;
+
+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.io.Serializable;
+
+/**
+ * 鏍峰搧绠$悊
+ */
+@Data
+@TableName("yangpin_guanli")
+public class YangpinGuanliEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 鏍峰搧绫诲瀷
+     */
+    @TableField("leixin")
+    private String leixin;
+
+    /**
+     * 鏍峰搧鍚嶇О
+     */
+    @TableField("mingcheng")
+    private String mingcheng;
+
+    /**
+     * 鏍峰搧缂栫爜
+     */
+    @TableField("bianma")
+    private String bianma;
+
+    /**
+     * 鏍峰搧瑙勬牸
+     */
+    @TableField("guige")
+    private String guige;
+
+    /**
+     * 鏍峰搧鍖呰瑙勬牸
+     */
+    @TableField("baozhuang_guige")
+    private String baozhuangGuige;
+
+    /**
+     * 鏍峰搧鎵�灞炰粨搴撳瓨鏀句綅缃�
+     */
+    @TableField("cangku_weizhi")
+    private String cangkuWeizhi;
+
+    /**
+     * 鍌ㄥ瓨鏉′欢
+     */
+    @TableField("cucun_tiaojian")
+    private String cucunTiaojian;
+
+    /**
+     * 鏄惁鍚敤: enabled-鍚敤, disabled-绂佺敤
+     */
+    @TableField("biz_enabled")
+    private String bizEnabled;
+
+    /**
+     * 澶囨敞
+     */
+    @TableField("note")
+    private String note;
+
+    /**
+     * 鏄惁鍚敤鍞竴璇嗗埆鐮�
+     */
+    @TableField("weiyi_shibiema_enabled")
+    private String weiyiShibiemaEnabled;
+
+    /**
+     * 涓婚敭ID
+     */
+    @TableId(value = "f_id")
+    @JsonProperty("f_id")
+    @JsonAlias("id")
+    private String id;
+
+    /**
+     * 绉熸埛ID
+     */
+    @TableField("f_tenant_id")
+    private String fTenantId;
+
+    /**
+     * 娴佺▼ID
+     */
+//    @TableField("f_flow_id")
+//    private String fFlowId;
+
+    /**
+     * 涔愯閿佺増鏈彿
+     */
+//    @TableField("f_version")
+//    private Integer fVersion;
+
+    /**
+     * 娴佺▼浠诲姟涓婚敭
+     */
+//    @TableField("f_flow_task_id")
+//    private String fFlowTaskId;
+
+    /**
+     * 娴佺▼浠诲姟鐘舵�侊細0-鏈彁浜ゃ��1-瀹℃牳涓��2-宸查�氳繃銆�3-宸查┏鍥�
+     */
+//    @TableField("f_flow_state")
+//    private Integer fFlowState;
+
+    /**
+     * 鍒犻櫎鏍囧織锛�0-鏈垹闄ゃ��1-宸插垹闄ゃ��
+     * 姘寸郴缁熶换鍔″湪鐢熸垚璇烽獙鍗曞墠蹇呴』鎹闃绘柇宸茶蒋鍒犻櫎鐨勬牱鍝侀厤缃��
+     */
+    @TableField("f_delete_mark")
+    private Integer fDeleteMark;
+
+    /**
+     * 鍒犻櫎鏃堕棿
+     */
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @TableField("f_delete_time")
+//    private Date fDeleteTime;
+
+    /**
+     * 鍒犻櫎鐢ㄦ埛ID
+     */
+//    @TableField("f_delete_user_id")
+//    private String fDeleteUserId;
+
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @TableField(value = "f_creator_time", fill = FieldFill.INSERT)
+//    private Date fCreatorTime;
+
+    /**
+     * 鍒涘缓鐢ㄦ埛ID
+     */
+//    @TableField(value = "f_creator_user_id", fill = FieldFill.INSERT)
+//    private String fCreatorUserId;
+
+    /**
+     * 淇敼鏃堕棿
+     */
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @TableField(value = "f_last_modify_time", fill = FieldFill.INSERT_UPDATE)
+//    private Date fLastModifyTime;
+
+    /**
+     * 淇敼鐢ㄦ埛ID
+     */
+//    @TableField(value = "f_last_modify_user_id", fill = FieldFill.INSERT_UPDATE)
+//    private String fLastModifyUserId;
+
+}

--
Gitblit v1.8.0