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

diff --git a/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/model/order/OrderInfoVO.java b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/model/order/OrderInfoVO.java
new file mode 100644
index 0000000..3472343
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/model/order/OrderInfoVO.java
@@ -0,0 +1,63 @@
+package jnpf.model.order;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 璁㈠崟淇℃伅
+ *
+ * @author JNPF寮�鍙戝钩鍙扮粍
+ * @version V3.1.0
+ * @copyright 寮曡繄淇℃伅鎶�鏈湁闄愬叕鍙�
+ * @date 2021/3/15 8:46
+ */
+@Data
+public class OrderInfoVO  {
+    @Schema(description ="鏈夋晥鏍囧織", example = "1")
+    private Integer enabledMark;
+    @Schema(description ="鍒跺崟浜哄憳")
+    private String creatorUserId;
+    @Schema(description ="闄勪欢淇℃伅")
+    private String fileJson;
+    @Schema(description ="浠樻鏂瑰紡")
+    private String paymentMode;
+    @Schema(description ="鍒跺崟鏃堕棿")
+    private Long creatorTime;
+    @Schema(description ="涓氬姟鍛業d")
+    private String salesmanId;
+    @Schema(description ="棰勪粯瀹氶噾")
+    private String prepayEarnest;
+    @Schema(description ="杩愯緭鏂瑰紡")
+    private String transportMode;
+    @Schema(description ="瀹㈡埛鍚嶇О")
+    private String customerName;
+    @Schema(description ="鍙戣揣鏃ユ湡")
+    private Long deliveryDate;
+    @Schema(description ="璁㈠崟涓婚敭")
+    private String id;
+    @Schema(description ="涓氬姟鍛�")
+    private String salesmanName;
+    @Schema(description ="瀹㈡埛Id")
+    private String customerId;
+    @Schema(description ="淇敼鏃堕棿")
+    private Long lastModifyTime;
+    @Schema(description ="搴旀敹閲戦")
+    private String receivableMoney;
+    @Schema(description ="鍙戣揣鍦板潃")
+    private String deliveryAddress;
+    @Schema(description ="瀹氶噾姣旂巼")
+    private String earnestRate;
+    @Schema(description ="鎻忚堪")
+    private String description;
+    @Schema(description ="淇敼鐢ㄦ埛")
+    private String lastModifyUserId;
+    @Schema(description ="璁㈠崟鏃ユ湡")
+    private Long orderDate;
+    @Schema(description ="璁㈠崟缂栧彿")
+    private String orderCode;
+    @Schema(description ="璁㈠崟鏄庣粏")
+    List<OrderInfoOrderEntryModel> goodsList;
+    @Schema(description ="鏀舵璁″垝")
+    List<OrderInfoOrderReceivableModel> collectionPlanList;
+}

--
Gitblit v1.8.0