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

diff --git a/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/ZhiliangBiaozhunGuanliZixiangEntity.java b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/ZhiliangBiaozhunGuanliZixiangEntity.java
new file mode 100644
index 0000000..6c69c5b
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/ZhiliangBiaozhunGuanliZixiangEntity.java
@@ -0,0 +1,116 @@
+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.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 璐ㄩ噺鏍囧噯妫�楠岄」鐩鐞�-瀛愯〃
+ */
+@Data
+@TableName("zhiliang_biaozhun_guanli_zixiang")
+public class ZhiliangBiaozhunGuanliZixiangEntity {
+
+    @TableId(value = "f_id")
+    @JsonProperty("f_id")
+    @JsonAlias("id")
+    private String id;
+
+    /** 澶栭敭锛堝叧鑱斾富琛� f_id锛� */
+    @TableField("f_foreign_id")
+    private String foreignId;
+
+    @TableField(value = "f_tenant_id", fill = FieldFill.INSERT_UPDATE)
+    private String tenantId;
+
+    /** 妫�鏌ョ彮缁� */
+    @TableField("jiancha_banzu")
+    private String jianchaBanzu;
+
+    /** 鏄惁鍑哄叿鎶ュ憡 */
+    @TableField("shifou_chuju_baogao")
+    private String shifouChujuBaogao;
+
+    /** 鏄惁澶栨 */
+    @TableField("shifou_waijian")
+    private String shifouWaijian;
+
+    /** 搴忓彿 */
+    @TableField("xuhao")
+    private BigDecimal xuhao;
+
+    /** 妫�楠岄」鐩悕绉� */
+    @TableField("jianyan_xiangmu_mingcheng")
+    private String jianyanXiangmuMingcheng;
+
+    /** 妫�楠岄」鐩紪鐮� */
+    @TableField("jianyan_xiangmu_bianma")
+    private String jianyanXiangmuBianma;
+
+    /** 鍒嗘瀽绫诲瀷 */
+    @TableField("fenxi_leixing")
+    private String fenxiLeixing;
+
+    /** 鏁版嵁绫诲瀷 */
+    @TableField("shuju_leixing")
+    private String shujuLeixing;
+
+    /** 鏍囧噯瑙勫畾 */
+    @TableField("biaozhun_guiding")
+    private String biaozhunGuiding;
+
+    /** 鏍囧噯涓婇檺 */
+    @TableField("biaozhun_shangxian")
+    private String biaozhunShangxian;
+
+    /** 鏍囧噯涓嬮檺 */
+    @TableField("biaozhun_xiaxian")
+    private String biaozhunXiaxian;
+
+    /** 妫�楠岄噺 */
+    @TableField("jianyan_liang")
+    private BigDecimal jianyanLiang;
+
+    /** 妫�楠屽崟浣� */
+    @TableField("jianyan_danwei")
+    private String jianyanDanwei;
+
+    /** 鍒嗘閲� */
+    @TableField("fenjian_liang")
+    private String fenjianLiang;
+
+    /** 鍒嗘鍗曚綅 */
+    @TableField("fenjian_danwei")
+    private String fenjianDanwei;
+
+    /** 鍒嗚瀹瑰櫒 */
+    @TableField("fenjian_fenzhuang_rongqi")
+    private String fenjianFenzhuangRongqi;
+
+    /** 鍒嗘淇濆瓨鏉′欢 */
+    @TableField("fenjian_baocun_tiaojian")
+    private String fenjianBaocunTiaojian;
+
+    /** 鍒嗘鐜 */
+    @TableField("fenjian_huanjing")
+    private String fenjianHuanjing;
+
+    /** 鍒犻櫎鏍囧織 */
+    @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