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/model/Workorder.java | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 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 bf11504..1058066 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.dao.web.dto.DCANoProblemDTO; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import com.baomidou.mybatisplus.annotation.IdType; @@ -100,10 +101,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 = "鍙戠敓鏃堕棿") @@ -214,6 +215,17 @@ @TableField(exist = false) private String qwId; + @ApiModelProperty(value = "瑙e喅鎯呭喌锛堟煡璇娇鐢級锛�0=鍚︼紱1=鏄紱",hidden = true) + @TableField(exist = false) + private Integer dealStatus; + @ApiModelProperty(value = "缁熻鏁帮紱",hidden = true) + @TableField(exist = false) + private Long num; + + + @ApiModelProperty("鏂囦欢璺緞鍓嶇紑") + @TableField(exist = false) + private String path; @ApiModelProperty(value = "涓嶇鍚堥棶棰樺垪琛�") @TableField(exist = false) -- Gitblit v1.9.3