From c4bd6e7e1fadfac44466d589ee4d5dfcf77c2a59 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 15 七月 2025 09:26:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/business/model/Orders.java | 9 ---------
1 files changed, 0 insertions(+), 9 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 b238a22..9e7fde9 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
@@ -39,7 +39,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -48,7 +47,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date updateTime;
@ApiModelProperty(value = "澶囨敞")
@@ -65,12 +63,10 @@
@ApiModelProperty(value = "寮�濮嬫椂闂� yyyy-MM-dd")
@ExcelColumn(name="寮�濮嬫椂闂� yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date startDate;
@ApiModelProperty(value = "缁撴潫鏃堕棿 yyyy-MM-dd")
@ExcelColumn(name="缁撴潫鏃堕棿 yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date endDate;
@ApiModelProperty(value = "鍦扮偣淇℃伅/鐢ㄨ溅璧风偣/鐢ㄩ鍦扮偣")
@@ -186,7 +182,6 @@
@ApiModelProperty(value = "鎺ュ崟鏃堕棿")
@ExcelColumn(name="鎺ュ崟鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date acceptTime;
@ApiModelProperty(value = "鎺ュ崟浜�", example = "1")
@@ -199,12 +194,10 @@
@ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂�")
@ExcelColumn(name="寮�濮嬩綔涓氭椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date workStartTime;
@ApiModelProperty(value = "瀹屾垚鏃堕棿")
@ExcelColumn(name="瀹屾垚鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date finishTime;
@ApiModelProperty(value = "骞冲彴鎻愭垚姣斾緥", example = "1")
@@ -229,7 +222,6 @@
@ApiModelProperty(value = "璇勪环鏃堕棿")
@ExcelColumn(name="璇勪环鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date commentTime;
@ApiModelProperty(value = "璇勪环绫诲瀷:0=鎵嬪姩璇勪环锛�1=绯荤粺鑷姩璇勪环锛�", example = "1")
@@ -238,7 +230,6 @@
@ApiModelProperty(value = "鍙栨秷鏃堕棿")
@ExcelColumn(name="鍙栨秷鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date cancelTime;
@ApiModelProperty(value = "鏄惁宸蹭慨鏀�:0=鍚︼紱1=鏄紱2=宸茬‘璁�;", example = "1")
--
Gitblit v1.9.3