From 391c0cfc4ba595ef26c7a2315c555d8c75afec7d Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 22 八月 2025 11:13:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/business/model/Orders.java | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 insertions(+), 2 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 a3f0a7b..197b04e 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
@@ -193,7 +193,7 @@
private Integer isUpdate;
@ApiModelProperty(value = "淇敼鏃堕棿", example = "1")
- private Integer isUpdateTime;
+ private Date isUpdateTime;
@ApiModelProperty(value = "鎺ュ崟鏂归粦鍚嶅崟member:id 澶氫釜浠�,鍒嗗壊")
private String blackReceive;
@@ -220,6 +220,9 @@
@ApiModelProperty(value = "杞﹁締瑙勬牸", example = "1")
private String carUnit;
+ @ApiModelProperty(value = "涓夋柟鏀粯璁㈠崟鍙�", example = "1")
+ private String outTradeNo;
+
@ApiModelProperty(value = "鍥剧墖")
@TableField(exist = false)
private List<Multifile> multifileList;
@@ -242,7 +245,7 @@
@TableField(exist = false)
private List<CateringDTO> cateringDTOList;
- @ApiModelProperty(value = "绉诲姩绔敤鎴�", hidden = true)
+ @ApiModelProperty(value = "绉诲姩绔敤鎴�")
@TableField(exist = false)
private Member member;
@@ -329,5 +332,41 @@
@TableField(exist = false)
private Date doneTimeEnd;
+ @ApiModelProperty(value = "鎺掑簭鏂瑰紡锛�0=鏈�鏂板彂甯�;1=璺濈浼樺厛;2=浠锋牸鍊掑簭", example = "1")
+ @TableField(exist = false)
+ private Integer sortType;
+
+ @ApiModelProperty(value = "鎺ュ崟鏂硅瘎鍒�")
+ @TableField(exist = false)
+ private double score;
+
+ @ApiModelProperty(value = "鎺ュ崟閲�")
+ @TableField(exist = false)
+ private Long receiveNum;
+
+ @ApiModelProperty(value = "鍙戝崟閲�")
+ @TableField(exist = false)
+ private Long publishNum;
+
+ @ApiModelProperty(value = "鍙戝崟鏂瑰ご鍍�")
+ @TableField(exist = false)
+ private String releaseCoverImage;
+
+ @ApiModelProperty(value = "鎺ュ崟鏂瑰ご鍍�")
+ @TableField(exist = false)
+ private String acceptCoverImage;
+
+ @ApiModelProperty(value = "缁忓害", example = "1")
+ @TableField(exist = false)
+ private BigDecimal queryLat;
+
+ @ApiModelProperty(value = "绾害", example = "1")
+ @TableField(exist = false)
+ private BigDecimal queryLgt;
+
+ @ApiModelProperty(value = "鏄惁鍙彇娑堬細0=鍙互锛�1=涓嶅彲浠�", example = "1")
+ @TableField(exist = false)
+ private Integer cancelStatus;
+
}
--
Gitblit v1.9.3