From 0af8d2525b8e58c3eb2c3eb30bb32ac482d20856 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 15 七月 2025 11:03:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/business/model/Orders.java | 23 +++++++++++++++++++----
1 files changed, 19 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 9e7fde9..384a0f5 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
@@ -153,7 +153,7 @@
private String transportUnit;
@ApiModelProperty(value = "鐢ㄨ溅缁堢偣鍦板潃")
- @ExcelColumn(name="鐢ㄨ溅缁堢偣鍦板潃")
+ @ExcelColumn(name = "鐢ㄨ溅缁堢偣鍦板潃")
private String locationEnd;
@ApiModelProperty(value = "鐢ㄨ溅缁堢偣缁忓害")
@@ -246,7 +246,7 @@
private Integer totalDays;
@ApiModelProperty(value = "鍙栨秷绫诲瀷锛�0=鍙戝崟鏂规棤璐ｅ彇娑堬紱1=鍙戝崟鏂规湁璐ｅ彇娑堬紱2=绯荤粺鍙栨秷锛�", example = "1")
- @ExcelColumn(name="鍙栨秷绫诲瀷锛�0=鍙戝崟鏂规棤璐ｅ彇娑堬紱1=鍙戝崟鏂规湁璐ｅ彇娑堬紱2=绯荤粺鍙栨秷锛�")
+ @ExcelColumn(name = "鍙栨秷绫诲瀷锛�0=鍙戝崟鏂规棤璐ｅ彇娑堬紱1=鍙戝崟鏂规湁璐ｅ彇娑堬紱2=绯荤粺鍙栨秷锛�")
private Integer cancelType;
@ApiModelProperty(value = "鍥剧墖")
@@ -261,11 +261,26 @@
@TableField(exist = false)
private List<CateringDTO> cateringDTOList;
-
- @ApiModelProperty(value = "绉诲姩绔敤鎴�",hidden = true)
+ @ApiModelProperty(value = "绉诲姩绔敤鎴�", hidden = true)
@TableField(exist = false)
private Member member;
+ @ApiModelProperty(value = "鏌ヨ鎴戠殑璁㈠崟锛�0=鍙戝崟鏂硅鍗曪紱1=鎺ュ崟鏂硅鍗曪紱2=鎺ュ崟澶у巺锛�", example = "1")
+ @TableField(exist = false)
+ private Integer queryMyOrderType;
+
+ @ApiModelProperty(value = "闇�姹傜被鍨�")
+ @TableField(exist = false)
+ private String categoryName;
+
+ @ApiModelProperty(value = "杩愯緭鍝佺")
+ @TableField(exist = false)
+ private String transportTypeName;
+
+ @ApiModelProperty(value = "璺濈 鍗曚綅km")
+ @TableField(exist = false)
+ private double distance;
}
+
--
Gitblit v1.9.3