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/model/order/OrderExportModel.java |   42 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 42 insertions(+), 0 deletions(-)

diff --git a/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/model/order/OrderExportModel.java b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/model/order/OrderExportModel.java
new file mode 100644
index 0000000..482f50f
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/model/order/OrderExportModel.java
@@ -0,0 +1,42 @@
+package jnpf.model.order;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 璁㈠崟淇℃伅
+ *
+ * @author JNPF寮�鍙戝钩鍙扮粍
+ * @version V3.1.0
+ * @copyright 寮曡繄淇℃伅鎶�鏈湁闄愬叕鍙�
+ * @date 2021/3/15 8:46
+ */
+@Data
+public class OrderExportModel {
+    private String customerId;
+    private String customerName;
+    private String salesmanId;
+    private String salesmanName;
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date orderDate;
+    private String orderCode;
+    private String transportMode;
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date deliveryDate;
+    private String deliveryAddress;
+    private String paymentMode;
+    private BigDecimal receivableMoney;
+    private BigDecimal earnestRate;
+    private BigDecimal prepayEarnest;
+    private String description;
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date creatorTime;
+    private String creatorUserId;
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date lastModifyTime;
+    private String lastModifyUserId;
+
+}

--
Gitblit v1.8.0