From 3e210fac9492b90e21ca9bf76c1d9a8fda1f4388 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 13 五月 2026 11:32:17 +0800
Subject: [PATCH] 代码生成

---
 server/services/src/main/java/com/doumee/dao/business/model/Orders.java |   40 ++++++++++++++++++++++++++++++++++++----
 1 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Orders.java b/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
index b03f799..769335c 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
@@ -61,6 +61,9 @@
     @ExcelColumn(name = "瀵勫瓨鏂瑰紡", valueMapping = "0=灏卞湴瀛樺彇;1=寮傚湴瀛樺彇;")
     private Integer type;
 
+    @ApiModelProperty(value = "鏄惁杞崲璁㈠崟锛�0=鍚︼紱1=鏄紙寮傚湴杞氨鍦帮級", example = "0")
+    private Integer isConverted;
+
     @ApiModelProperty(value = "鏄惁蹇呴』鏈汉绛炬敹锛�0=鍚︼紱1=鏄�", example = "0")
     @ExcelColumn(name = "鏈汉绛炬敹", valueMapping = "0=鍚�;1=鏄�;")
     private Integer selfTake;
@@ -230,11 +233,10 @@
     private Long declaredFee;
 
     @ApiModelProperty(value = "鍔犳�ヨ垂鐢紙鍒嗭級")
-    @ExcelColumn(name = "鍔犳�ヨ垂鐢�")
     private Long urgentAmount;
 
     @ApiModelProperty(value = "骞冲彴濂栧姳鍙告満璐圭敤锛堝垎锛�")
-    @ExcelColumn(name = "骞冲彴濂栧姳鍙告満璐圭敤")
+    @ExcelColumn(name = "鍔犳�ヨ垂鐢�")
     private Long platformRewardAmount;
 
     @ApiModelProperty(value = "鎸囨淳鍙告満鐢ㄦ埛涓婚敭锛坢ember:id锛�")
@@ -370,12 +372,12 @@
     private Date platformSmsNotifiedTime;
 
     @TableField(exist = false)
-    @ApiModelProperty(value = "鍒涘缓寮�濮嬫椂闂�(鏌ヨ鐢�)", example = "2026-01-01")
+    @ApiModelProperty(value = "鍒涘缓寮�濮嬫椂闂�(鏌ヨ鐢�)", example = "2026-01-01 00:00:00")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createStartTime;
 
     @TableField(exist = false)
-    @ApiModelProperty(value = "鍒涘缓缁撴潫鏃堕棿(鏌ヨ鐢�)", example = "2026-12-31")
+    @ApiModelProperty(value = "鍒涘缓缁撴潫鏃堕棿(鏌ヨ鐢�)", example = "2026-12-31 23:59:59")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createEndTime;
 
@@ -420,6 +422,22 @@
     private String c2OtherField;
 
     @TableField(exist = false)
+    @ApiModelProperty(value = "鐗╁搧绛夌骇鍚嶇О锛堝叧鑱旀煡璇級")
+    private String goodLevelName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "鐗╁搧绫诲瀷鍚嶇О锛堝叧鑱旀煡璇級")
+    private String goodTypeName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "鏄惁瀛樺湪鐗瑰ぇ灏哄锛�0=鍚� 1=鏄紙鍏宠仈鏌ヨ锛�")
+    private Integer hasOversized;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "璁㈠崟鐘舵�佹弿杩�")
+    private String statusDesc;
+
+    @TableField(exist = false)
     @ApiModelProperty(value = "鍙告満濮撳悕锛堝叧鑱旀煡璇級")
     private String driverName;
 
@@ -427,4 +445,18 @@
     @ApiModelProperty(value = "鍙告満鐢佃瘽锛堝叧鑱旀煡璇級")
     private String driverPhone;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "闂ㄥ簵涓婚敭锛堝悓鏃舵煡璇㈠瓨浠�/鍙栦欢闂ㄥ簵锛�")
+    private Integer shopId;
+
+
+    @ApiModelProperty(value = "搴楅摵璁㈠崟搴忓彿")
+    private Long autoNum;
+
+    @ApiModelProperty(value = "鍙栦欢鏃堕棿鍗冲皢鍒拌揪閫氱煡鐘舵�侊細0=鏈�氱煡锛�1=宸查�氱煡")
+    private Integer pickUpNotifyStatus;
+
+    @ApiModelProperty(value = "搴忓彿")
+    @TableField(exist = false)
+    private Integer sortNum;
 }

--
Gitblit v1.9.3