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

diff --git a/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/model/order/OrderForm.java b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/model/order/OrderForm.java
new file mode 100644
index 0000000..15e636c
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/model/order/OrderForm.java
@@ -0,0 +1,61 @@
+package jnpf.model.order;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 璁㈠崟淇℃伅
+ *
+ * @author JNPF寮�鍙戝钩鍙扮粍
+ * @version V3.1.0
+ * @copyright 寮曡繄淇℃伅鎶�鏈湁闄愬叕鍙�
+ * @date 2021/3/15 8:46
+ */
+@Data
+public class OrderForm {
+    @Schema(description ="璁㈠崟鏃ユ湡")
+    private Long orderDate;
+    @Schema(description ="璁㈠崟缂栧彿")
+    private String orderCode;
+    @Schema(description ="搴旀敹閲戦")
+    private String receivableMoney;
+    @Schema(description ="瀹氶噾姣旂巼")
+    private String earnestRate;
+    @Schema(description ="棰勪粯瀹氶噾")
+    private String prepayEarnest;
+    @Schema(description ="瀹㈡埛鍚嶇О")
+    private String customerName;
+    @Schema(description ="瀹㈡埛Id")
+    private String customerId;
+    @Schema(description ="涓氬姟鍛業d")
+    private String salesmanId;
+    @Schema(description ="涓氬姟鍛�")
+    private String salesmanName;
+    @Schema(description ="浠樻鏂瑰紡")
+    private String paymentMode;
+    @Schema(description ="鎻忚堪")
+    private String description;
+    @Schema(description ="杩愯緭鏂瑰紡")
+    private String transportMode;
+    @Schema(description ="鍙戣揣鏃ユ湡")
+    private Long deliveryDate;
+    @Schema(description ="鍙戣揣鍦板潃")
+    private String deliveryAddress;
+    @Schema(description ="闄勪欢淇℃伅")
+    private String fileJson;
+    @Schema(description ="鑷劧涓婚敭")
+    private String id;
+    @Schema(description ="鍟嗗搧鏄庣粏")
+    private List<OrderEntryModel> goodsList = new ArrayList<>();
+    @Schema(description ="鏀舵璁″垝")
+    private List<OrderReceivableModel> collectionPlanList = new ArrayList<>();
+    @Schema(description ="鐘舵��")
+    private String status;
+    @Schema(description ="娴佺▼")
+    private String flowId;
+}
+

--
Gitblit v1.8.0