From 5587f3aede4d4d373835fa7e48a4cff229021ac8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 11 四月 2025 11:16:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/dao/business/model/Workorder.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/server/src/main/java/com/doumee/dao/business/model/Workorder.java b/server/src/main/java/com/doumee/dao/business/model/Workorder.java
index 1d7f413..404c62a 100644
--- a/server/src/main/java/com/doumee/dao/business/model/Workorder.java
+++ b/server/src/main/java/com/doumee/dao/business/model/Workorder.java
@@ -50,8 +50,8 @@
@ExcelExportColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
- @ApiModelProperty(value = "鎵�灞炲垎绫荤紪锛堝叧鑱攃ategory)")
- @ExcelExportColumn(name="鎵�灞炲垎绫荤紪锛堝叧鑱攃ategory)")
+ @ApiModelProperty(value = "DCA鍒嗙被锛堝叧鑱攃ategory)")
+ @ExcelExportColumn(name="DCA鍒嗙被锛堝叧鑱攃ategory)")
private String categoryId;
@ApiModelProperty(value = "澶囨敞")
@@ -137,18 +137,15 @@
@ApiModelProperty(value = "椋庨櫓鎻忚堪", example = "1")
@ExcelExportColumn(name="椋庨櫓鎻忚堪")
private String riskInfo;
-
@ApiModelProperty(value = "褰撳墠鐗╀笟涓荤浼佷笟寰俊缂栫爜", example = "1")
@ExcelExportColumn(name="褰撳墠鐗╀笟涓荤浼佷笟寰俊缂栫爜")
private String managerId;
-
@ApiModelProperty(value = "褰撳墠澶勭悊浜哄憳浼佷笟寰俊缂栫爜", example = "1")
@ExcelExportColumn(name="褰撳墠澶勭悊浜哄憳浼佷笟寰俊缂栫爜")
private String dealerId;
@ApiModelProperty(value = "鍒嗛厤鏃堕棿")
@ExcelExportColumn(name="鍒嗛厤鏃堕棿")
-
private Date dispatchTime;
@ApiModelProperty(value = "鍒嗛厤澶囨敞")
@@ -225,6 +222,9 @@
@ApiModelProperty("椋庨櫓绫诲瀷鍚嶇О")
@TableField(exist = false)
private String typeName;
+ @ApiModelProperty("浜岀骇涓婚鍚嶇О")
+ @TableField(exist = false)
+ private String categoryName;
@ApiModelProperty("DCA闂鍚嶇О")
@TableField(exist = false)
private String problemName;
@@ -238,7 +238,8 @@
@TableField(exist = false)
private List<DCANoProblemDTO> dcaNoProblemDTOList;
-
-
+ @ApiModelProperty(value = "涓嶇鍚堥棶棰樺垪琛�(璇︽儏椤碉級")
+ @TableField(exist = false)
+ private List<Workorder> dcaChildList;
}
--
Gitblit v1.9.3