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

diff --git a/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/entity/OrderEntity.java b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/entity/OrderEntity.java
new file mode 100644
index 0000000..0966961
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/entity/OrderEntity.java
@@ -0,0 +1,119 @@
+package jnpf.entity;
+
+import jnpf.base.entity.SuperExtendEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 璁㈠崟淇℃伅
+ *
+ * @author JNPF寮�鍙戝钩鍙扮粍
+ * @version V3.1.0
+ * @copyright 寮曡繄淇℃伅鎶�鏈湁闄愬叕鍙革紙https://www.jnpfsoft.com锛�
+ * @date 2019骞�9鏈�26鏃� 涓婂崍9:18
+ */
+@Data
+@TableName("ext_order")
+public class OrderEntity extends SuperExtendEntity.SuperExtendDEEntity<String> {
+
+    /**
+     * 瀹㈡埛Id
+     */
+    @TableField("F_CUSTOMER_ID")
+    private String customerId;
+
+    /**
+     * 瀹㈡埛鍚嶇О
+     */
+    @TableField("F_CUSTOMER_NAME")
+    private String customerName;
+
+    /**
+     * 涓氬姟鍛業d
+     */
+    @TableField("F_SALESMAN_ID")
+    private String salesmanId;
+
+    /**
+     * 涓氬姟鍛�
+     */
+    @TableField("F_SALESMAN_NAME")
+    private String salesmanName;
+
+    /**
+     * 璁㈠崟鏃ユ湡
+     */
+    @TableField("F_ORDER_DATE")
+    private Date orderDate;
+
+    /**
+     * 璁㈠崟缂栫爜
+     */
+    @TableField("F_ORDER_CODE")
+    private String orderCode;
+
+    /**
+     * 杩愯緭鏂瑰紡
+     */
+    @TableField("F_TRANSPORT_MODE")
+    private String transportMode;
+
+    /**
+     * 鍙戣揣鏃ユ湡
+     */
+    @TableField("F_DELIVERY_DATE")
+    private Date deliveryDate;
+
+    /**
+     * 鍙戣揣鍦板潃
+     */
+    @TableField("F_DELIVERY_ADDRESS")
+    private String deliveryAddress;
+
+    /**
+     * 浠樻鏂瑰紡
+     */
+    @TableField("F_PAYMENT_MODE")
+    private String paymentMode;
+
+    /**
+     * 搴旀敹閲戦
+     */
+    @TableField("F_RECEIVABLE_MONEY")
+    private BigDecimal receivableMoney;
+
+    /**
+     * 瀹氶噾姣旂巼
+     */
+    @TableField("F_EARNEST_RATE")
+    private BigDecimal earnestRate;
+
+    /**
+     * 棰勪粯瀹氶噾
+     */
+    @TableField("F_PREPAY_EARNEST")
+    private BigDecimal prepayEarnest;
+
+    /**
+     * 褰撳墠鐘舵��
+     */
+    @TableField("F_CURRENT_STATE")
+    private Integer currentState;
+
+    /**
+     * 娴佺▼寮曟搸
+     */
+    @TableField("F_FLOW_ID")
+    private String flowId;
+
+    /**
+     * 闄勪欢淇℃伅
+     */
+    @TableField("F_FILE_JSON")
+    private String fileJson;
+
+}

--
Gitblit v1.8.0