From 5ae8418d22dd7ba374ff7277181aceec1d509324 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 16 七月 2025 18:26:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/business/model/Orders.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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 67a3239..50289c1 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
@@ -25,6 +25,7 @@
@TableName("`orders`")
public class Orders {
+ @TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
private Integer id;
@@ -55,9 +56,11 @@
private Integer type;
@ApiModelProperty(value = "寮�濮嬫椂闂� yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date startDate;
@ApiModelProperty(value = "缁撴潫鏃堕棿 yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date endDate;
@ApiModelProperty(value = "鍦扮偣淇℃伅/鐢ㄨ溅璧风偣/鐢ㄩ鍦扮偣")
@@ -210,6 +213,15 @@
@ApiModelProperty(value = "鏀粯鏃堕棿", example = "1")
private Date payTime;
+ @ApiModelProperty(value = "鑱旂郴浜�", example = "1")
+ private String linkPhone;
+
+ @ApiModelProperty(value = "鑱旂郴鏂瑰紡", example = "1")
+ private String linkName;
+
+ @ApiModelProperty(value = "杞﹁締瑙勬牸", example = "1")
+ private String carUnit;
+
@ApiModelProperty(value = "鍥剧墖")
@TableField(exist = false)
private List<Multifile> multifileList;
--
Gitblit v1.9.3