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

diff --git a/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/entity/ProductEntity.java b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/entity/ProductEntity.java
new file mode 100644
index 0000000..eb4099d
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/entity/ProductEntity.java
@@ -0,0 +1,187 @@
+package jnpf.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import jnpf.base.entity.SuperExtendEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 閿�鍞鍗�
+ *
+ * @鐗堟湰锛� V3.1.0
+ * @鐗堟潈锛� 寮曡繄淇℃伅鎶�鏈湁闄愬叕鍙革紙https://www.jnpfsoft.com锛�
+ * @浣滆�咃細 JNPF寮�鍙戝钩鍙扮粍
+ * @鏃ユ湡锛� 2021-07-10 10:40:59
+ */
+@Data
+@TableName("ext_product")
+public class ProductEntity extends SuperExtendEntity.SuperExtendDescriptionEntity<String> {
+
+    /**
+     * 璁㈠崟缂栧彿
+     */
+    @TableField("F_EN_CODE")
+    private String enCode;
+
+    /**
+     * 瀹㈡埛绫诲埆
+     */
+    @TableField("F_TYPE")
+    @JSONField(name = "code")
+    private String type;
+
+    /**
+     * 瀹㈡埛id
+     */
+    @TableField("F_CUSTOMER_ID")
+    private String customerId;
+
+    /**
+     * 瀹㈡埛鍚嶇О
+     */
+    @TableField("F_CUSTOMER_NAME")
+    private String customerName;
+
+    /**
+     * 鍒跺崟浜�
+     */
+    @TableField("F_SALESMAN_ID")
+    private String salesmanId;
+
+    /**
+     * 鍒跺崟浜�
+     */
+    @TableField("F_SALESMAN_NAME")
+    private String salesmanName;
+
+    /**
+     * 鍒跺崟鏃ユ湡
+     */
+    @TableField("F_SALESMAN_DATE")
+    private Date salesmanDate;
+
+    /**
+     * 瀹℃牳浜�
+     */
+    @TableField("F_AUDIT_NAME")
+    private String auditName;
+
+    /**
+     * 瀹℃牳鏃ユ湡
+     */
+    @TableField("F_AUDIT_DATE")
+    private Date auditDate;
+
+    /**
+     * 瀹℃牳鐘舵��
+     */
+    @TableField("F_AUDIT_STATE")
+    private Integer auditState;
+
+    /**
+     * 鍙戣揣浠撳簱
+     */
+    @TableField("F_GOODS_WAREHOUSE")
+    private String goodsWarehouse;
+
+    /**
+     * 鍙戣揣鏃ユ湡
+     */
+    @TableField("F_GOODS_DATE")
+    private Date goodsDate;
+
+    /**
+     * 鍙戣揣閫氱煡浜�
+     */
+    @TableField("F_CONSIGNOR")
+    private String consignor;
+
+    /**
+     * 鍙戣揣鐘舵��
+     */
+    @TableField("F_GOODS_STATE")
+    private Integer goodsState;
+
+    /**
+     * 鍏抽棴鐘舵��
+     */
+    @TableField("F_CLOSE_STATE")
+    private Integer closeState;
+
+    /**
+     * 鍏抽棴鏃ユ湡
+     */
+    @TableField("F_CLOSE_DATE")
+    private Date closeDate;
+
+    /**
+     * 鏀舵鏂瑰紡
+     */
+    @TableField("F_GATHERING_TYPE")
+    private String gatheringType;
+
+    /**
+     * 涓氬姟鍛�
+     */
+    @TableField("F_BUSINESS")
+    private String business;
+
+    /**
+     * 閫佽揣鍦板潃
+     */
+    @TableField("F_ADDRESS")
+    private String address;
+
+    /**
+     * 鑱旂郴鏂瑰紡
+     */
+    @TableField("F_CONTACT_TEL")
+    private String contactTel;
+
+    /**
+     * 鑱旂郴浜�
+     */
+    @TableField("F_CONTACT_NAME")
+    private String contactName;
+
+    /**
+     * 鏀惰揣娑堟伅
+     */
+    @TableField("F_HARVEST_MSG")
+    private Integer harvestMsg;
+
+    /**
+     * 鏀惰揣浠撳簱
+     */
+    @TableField("F_HARVEST_WAREHOUSE")
+    private String harvestWarehouse;
+
+    /**
+     * 浠e彂瀹㈡埛
+     */
+    @TableField("F_ISSUING_NAME")
+    private String issuingName;
+
+    /**
+     * 璁╁埄閲戦
+     */
+    @TableField("F_PART_PRICE")
+    private BigDecimal partPrice;
+
+    /**
+     * 浼樻儬閲戦
+     */
+    @TableField("F_REDUCED_PRICE")
+    private BigDecimal reducedPrice;
+
+    /**
+     * 鎶樺悗閲戦
+     */
+    @TableField("F_DISCOUNT_PRICE")
+    private BigDecimal discountPrice;
+
+}

--
Gitblit v1.8.0