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

diff --git a/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsWendingxingChurukuZixiangEntity.java b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsWendingxingChurukuZixiangEntity.java
new file mode 100644
index 0000000..6083352
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsWendingxingChurukuZixiangEntity.java
@@ -0,0 +1,100 @@
+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_wendingxing_churuku_zixiang")
+public class LimsWendingxingChurukuZixiangEntity {
+
+    @TableId("f_id")
+    private String id;
+
+    @JsonProperty("jihua_zhouqi_id")
+    @TableField("jihua_zhouqi_id")
+    private String jihuaZhouqiId;
+
+    /** 鍓嶇鍏宠仈瀛楁锛屽綋鍓嶅瓙琛ㄦ棤瀵瑰簲鍒楋紝浠呯敤浜庢帴鏀惰姹傘�� */
+    @JsonProperty("kaoca_jihua_id")
+    @TableField(exist = false)
+    private String kaocaJihuaId;
+
+    @JsonProperty("yangpin_mingcheng")
+    @TableField("yangpin_mingcheng")
+    private String yangpinMingcheng;
+
+    @JsonProperty("yangpin_id")
+    @TableField("yangpin_id")
+    private String yangpinId;
+
+    @TableField("guige")
+    private String guige;
+
+    @TableField("pihao")
+    private String pihao;
+
+    @JsonProperty("cunfang_tiaojian")
+    @TableField("cunfang_tiaojian")
+    private String cunfangTiaojian;
+
+    @TableField("xiancunliang")
+    private String xiancunliang;
+
+    @JsonProperty("shuliang_danwei")
+    @TableField("shuliang_danwei")
+    private String shuliangDanwei;
+
+    @JsonProperty("churuku_leixing")
+    @TableField("churuku_leixing")
+    private String churukuLeixing;
+
+    @JsonProperty("churuku_shuliang")
+    @TableField("churuku_shuliang")
+    private String churukuShuliang;
+
+    @JsonProperty("laiyuan_quxiang")
+    @TableField("laiyuan_quxiang")
+    private String laiyuanQuxiang;
+
+    @TableField("beizhu")
+    private String beizhu;
+
+    @TableField("f_foreign_id")
+    private String foreignId;
+
+    @TableField(value = "f_tenant_id", fill = FieldFill.INSERT_UPDATE)
+    private String tenantId;
+
+    @TableField("f_delete_mark")
+    private Integer deleteMark;
+
+    @TableField("f_delete_time")
+    private Date deleteTime;
+
+    @TableField("f_delete_user_id")
+    private String deleteUserId;
+
+    @TableField(value = "f_creator_user_id", fill = FieldFill.INSERT)
+    private String creatorUserId;
+
+    @TableField(value = "f_creator_time", fill = FieldFill.INSERT)
+    private Date creatorTime;
+
+    @TableField("shouruliang")
+    private String shouruliang;
+
+    @TableField("fachuliang")
+    private String fachuliang;
+
+    @TableField("jiecunliang")
+    private String jiecunliang;
+}

--
Gitblit v1.8.0