From 3dd12d913b5d9c2096e53f9d14475c534b813e6b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 22 四月 2025 08:06:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaDto.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaDto.java b/server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaDto.java
index d9e5f3b..7fe4129 100644
--- a/server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaDto.java
+++ b/server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaDto.java
@@ -32,13 +32,19 @@
@ExcelColumn(name="鍙戠幇鏃堕棿",index =6 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
private Date happenTime;
@ApiModelProperty(value = "绗﹀悎椤规暟閲�", example = "1")
- @ExcelColumn(name="绗﹀悎椤规暟閲�",index =7,width = 4)
+ @ExcelColumn(name="绗﹀悎椤规暟閲�",index =7,width = 8)
private Integer dcaYesNum;
@ApiModelProperty(value = "涓嶇鍚堥」鏁伴噺", example = "1")
- @ExcelColumn(name="涓嶇鍚堥」鏁伴噺",index =8,width = 4)
+ @ExcelColumn(name="涓嶇鍚堥」鏁伴噺",index =8,width = 8)
private Integer dcaNoNum;
+ @ApiModelProperty(value = "浣嶇疆", example = "1")
+ @ExcelColumn(name="浣嶇疆",index =9 ,width = 10)
+ private String locationName;
+ @ApiModelProperty("閫氱煡浜�")
+ @ExcelColumn(name="閫氱煡浜�",index =10,width = 8)
+ private String memberNames;
@ApiModelProperty("鎻愭姤浜哄憳鍚嶇О")
- @ExcelColumn(name="涓婃姤鍛樺伐",index =12,width = 4)
+ @ExcelColumn(name="涓婃姤鍛樺伐",index =12,width = 8)
private String memberName;
@ApiModelProperty("鍛樺伐鎵嬫満鍙�")
@ExcelColumn(name="鍛樺伐鎵嬫満鍙�",index =13,width = 6)
--
Gitblit v1.9.3