From 14e0babcc1bed5e899342fa5536eafc4340cd899 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 16 四月 2025 11:19:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/dao/business/model/Workorder.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 5f4e096..a9cfbf0 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
@@ -100,10 +100,10 @@
@ApiModelProperty(value = "浜嬩欢璇存槑", example = "1")
private String eventInfo;
- @ApiModelProperty(value = "閭欢閫氱煡浜哄憳缂栫爜闆嗗悎")
+ @ApiModelProperty(value = "閭欢閫氱煡浜哄憳缂栫爜闆嗗悎 memberId")
private String emialMemberIds;
- @ApiModelProperty(value = "浼佷笟寰俊閫氱煡浜哄憳缂栫爜闆嗗悎")
+ @ApiModelProperty(value = "浼佷笟寰俊閫氱煡浜哄憳缂栫爜闆嗗悎 qwId")
private String qwnoticeMemberIds;
@ApiModelProperty(value = "鍙戠敓鏃堕棿")
@@ -203,15 +203,26 @@
@ApiModelProperty(value = "鏄惁鍙浆浜ゆ寜閽細0=鍚︼紱1=鏄紱", example = "0")
@TableField(exist = false)
private Integer passOnButton;
-
@ApiModelProperty(value = "鎴戠殑宸ュ崟:0=鍚︼紱1=鏄紙鏌ヨ浣跨敤锛�", example = "0")
@TableField(exist = false)
private Integer myWorkOrder;
+ @ApiModelProperty(value = "鍒嗙被缂栫爜璺緞", example = "0")
+ @TableField(exist = false)
+ private String typeIdPath;
@ApiModelProperty(value = "鎴戠殑宸ュ崟锛堟煡璇娇鐢級",hidden = true)
@TableField(exist = false)
private String qwId;
+ @ApiModelProperty(value = "瑙ｅ喅鎯呭喌锛堟煡璇娇鐢級锛�0=鍚︼紱1=鏄紱",hidden = true)
+ @TableField(exist = false)
+ private Integer dealStatus;
+
+
+ @ApiModelProperty("鏂囦欢璺緞鍓嶇紑")
+ @TableField(exist = false)
+ private String path;
+
@ApiModelProperty(value = "涓嶇鍚堥棶棰樺垪琛�")
@TableField(exist = false)
private List<DCANoProblemDTO> dcaNoProblemDTOList;
--
Gitblit v1.9.3