From 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 09:42:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/business/model/Orders.java | 20 ++++++++++++++++----
1 files changed, 16 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 35b0acb..ae1f59d 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
@@ -370,13 +370,13 @@
private Date platformSmsNotifiedTime;
@TableField(exist = false)
- @ApiModelProperty(value = "鍒涘缓寮�濮嬫椂闂�(鏌ヨ鐢�)", example = "2026-01-01")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鍒涘缓寮�濮嬫椂闂�(鏌ヨ鐢�)", example = "2026-01-01 00:00:00")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createStartTime;
@TableField(exist = false)
- @ApiModelProperty(value = "鍒涘缓缁撴潫鏃堕棿(鏌ヨ鐢�)", example = "2026-12-31")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鍒涘缓缁撴潫鏃堕棿(鏌ヨ鐢�)", example = "2026-12-31 23:59:59")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createEndTime;
@TableField(exist = false)
@@ -424,8 +424,16 @@
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 = "鍙告満濮撳悕锛堝叧鑱旀煡璇級")
@@ -435,4 +443,8 @@
@ApiModelProperty(value = "鍙告満鐢佃瘽锛堝叧鑱旀煡璇級")
private String driverPhone;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "闂ㄥ簵涓婚敭锛堝悓鏃舵煡璇㈠瓨浠�/鍙栦欢闂ㄥ簵锛�")
+ private Integer shopId;
+
}
--
Gitblit v1.9.3