From ff087240b3dee29ce4e14ad0836e76b9fdf312cf Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 19 八月 2025 09:28:07 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/lianhelihua_sh
---
server/src/main/java/com/doumee/dao/business/vo/WorkorderDbhDto.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/server/src/main/java/com/doumee/dao/business/vo/WorkorderDbhDto.java b/server/src/main/java/com/doumee/dao/business/vo/WorkorderDbhDto.java
index afd73f1..50eb1bb 100644
--- a/server/src/main/java/com/doumee/dao/business/vo/WorkorderDbhDto.java
+++ b/server/src/main/java/com/doumee/dao/business/vo/WorkorderDbhDto.java
@@ -26,16 +26,19 @@
@ExcelColumn(name="椋庨櫓绫诲瀷",index =3,width = 6)
private String typeName;
@ApiModelProperty(value = "鐘舵�� 鐘舵�� 0寰呯‘璁�/寰呭垵瀹� 1寰呭垎閰�/寰呯粓瀹� 2寰呭鐞� 4WTS鍏抽棴 5宸ョ▼甯堝叧闂�", example = "1")
- @ExcelColumn(name="鐘舵��",index =4,width = 4, valueMapping = "0=寰呭鐞�;1=澶勭悊涓�;2=澶勭悊涓�;3=宸插鐞�;4=宸插鐞�;5=宸插鐞�;")
+ @ExcelColumn(name="鐘舵��",index =4,width = 4, valueMapping = "0=澶勭悊涓�;1=澶勭悊涓�;2=澶勭悊涓�;3=宸插鐞�;4=宸插鐞�;5=宸插鐞�;")
private Integer status;
+ @ApiModelProperty(value = "鐘舵�佹弿杩�")
+ @ExcelColumn(name="鐘舵�佹弿杩�",index =5,width = 8)
+ private String statusName;
@ApiModelProperty(value = "涓婃姤鏃堕棿", example = "1")
- @ExcelColumn(name="涓婃姤鏃堕棿",index =5 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
+ @ExcelColumn(name="涓婃姤鏃堕棿",index =6 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
private Date submitDate;
@ApiModelProperty(value = "鍙戠幇鏃堕棿", example = "1")
- @ExcelColumn(name="鍙戠幇鏃堕棿",index =6 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
+ @ExcelColumn(name="鍙戠幇鏃堕棿",index =7 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
private Date happenTime;
@ApiModelProperty(value = "鍙戠敓鍦扮偣", example = "1")
- @ExcelColumn(name="鍙戠敓鍦扮偣",index =7 ,width = 6)
+ @ExcelColumn(name="鍙戠敓鍦扮偣",index =8 ,width = 6)
private String locationName;
@ApiModelProperty(value = "椋庨櫓鎻忚堪", example = "1")
@ExcelColumn(name="椋庨櫓鎻忚堪",index =11,width = 10)
--
Gitblit v1.9.3