From 22603b2519b8dcb7f9a7c7d9ba636d9aba240a59 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 七月 2025 09:15:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/business/model/Orders.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 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 71b0ec2..a3f0a7b 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 = "鍦扮偣淇℃伅/鐢ㄨ溅璧风偣/鐢ㄩ鍦扮偣")
@@ -87,10 +90,10 @@
@ApiModelProperty(value = "鐢ㄥ伐绫诲瀷:0=閲囨憳宸ワ紱1=鍒嗘嫞宸ワ紱2=鍖呰宸ワ紱锛堢敤宸ヨ鍗曪級", example = "1")
private Integer workType;
- @ApiModelProperty(value = "璁′环鏁伴噺1(澶╂暟/鐢ㄨ溅娆℃暟/灏忔椂/鏂ゆ暟)", example = "1")
+ @ApiModelProperty(value = "璁′环鏁伴噺1((閲嶉噺/浜烘暟/锛堝ぉ鏁�/灏忔椂/閲嶉噺锛�/锛堝ぉ鏁�/娆℃暟锛�/鐢ㄩ澶╂暟)", example = "1")
private Integer priceNum1;
- @ApiModelProperty(value = "璁′环鏁伴噺2(浜烘暟/鐢ㄩ浠芥暟)", example = "1")
+ @ApiModelProperty(value = "璁′环鏁伴噺2(鍒嗘嫞宸�/鍖呰宸� 浜烘暟)", example = "1")
private Integer priceNum2;
@ApiModelProperty(value = "闇�姹傝ˉ鍏�")
@@ -101,7 +104,6 @@
@ApiModelProperty(value = "棰勪及璐圭敤", example = "1")
private Long estimatedAccount;
-
@ApiModelProperty(value = "瀹為檯鏀粯璐圭敤", example = "1")
private Long payAccount;
@@ -203,6 +205,21 @@
@ApiModelProperty(value = "鍙栨秷绫诲瀷锛�0=鍙戝崟鏂规棤璐ｅ彇娑堬紱1=鍙戝崟鏂规湁璐ｅ彇娑堬紱2=绯荤粺鍙栨秷锛�", example = "1")
private Integer cancelType;
+ @ApiModelProperty(value = "鏀粯鏂瑰紡锛�0=寰俊锛�1=鍏朵粬", example = "1")
+ private Integer payMethod;
+
+ @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;
@@ -280,6 +297,9 @@
@TableField(exist = false)
private Date createTimeEnd;
+ @ApiModelProperty(value = "璐圭敤鏍囧噯鍗曚綅", example = "1")
+ @TableField(exist = false)
+ private String priceUnit;
@ApiModelProperty(value = "鎺ュ崟鏃堕棿璧�")
--
Gitblit v1.9.3