From c44c76ea3e1f6b70bb84bdde85ffd1b389e5b8f4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 23 四月 2025 10:58:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/dao/business/vo/WorkorderSheDto.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/server/src/main/java/com/doumee/dao/business/vo/WorkorderSheDto.java b/server/src/main/java/com/doumee/dao/business/vo/WorkorderSheDto.java
index 2a4e7a9..91168ed 100644
--- a/server/src/main/java/com/doumee/dao/business/vo/WorkorderSheDto.java
+++ b/server/src/main/java/com/doumee/dao/business/vo/WorkorderSheDto.java
@@ -53,14 +53,13 @@
@ExcelColumn(name="灏卞尰鎯呭喌",index =9,width = 8)
private String jiuyiInfo;
@ApiModelProperty(value = "鏄惁鍜屽伐浣滅浉鍏�", example = "1")
- @ExcelColumn(name="鏄惁鍜屽伐浣滅浉鍏�",index =10,width = 4, valueMapping = "0=鍚�;1=鏄�;")
+ @ExcelColumn(name="鏄惁鍜屽伐浣滅浉鍏�",index =10,width = 8, valueMapping = "0=鍚�;1=鏄�;")
private Integer workRelated;
@ApiModelProperty(value = "浜嬩欢璇存槑", example = "1")
@ExcelColumn(name="浜嬩欢璇存槑",index =11,width = 10)
private String eventInfo;
-
@ApiModelProperty("鎻愭姤浜哄憳鍚嶇О")
- @ExcelColumn(name="涓婃姤鍛樺伐",index =12,width = 4)
+ @ExcelColumn(name="涓婃姤鍛樺伐",index =12,width = 8)
private String memberName;
@ApiModelProperty("鍛樺伐鎵嬫満鍙�")
@ExcelColumn(name="鍛樺伐鎵嬫満鍙�",index =13,width = 6)
@@ -68,9 +67,11 @@
@ApiModelProperty("鎻愭姤浜哄憳鎵�灞為儴闂�")
@ExcelColumn(name="鎵�灞為儴闂�",index =14,width = 8)
private String companyName;
-
+ @ApiModelProperty(value = "鍙戠幇鏃堕棿")
+ @ExcelColumn(name="鍙戠幇鏃堕棿",index =15 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
+ private Date happenTime;
@ApiModelProperty(value = "鎻愪氦鏃堕棿")
- @ExcelColumn(name="鎻愪氦鏃堕棿",index =15 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
+ @ExcelColumn(name="鎻愪氦鏃堕棿",index =16 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
private Date createDate;
--
Gitblit v1.9.3