From fdb3e482f9a193eb7f793915e4c0dbbeba510ccf Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 02 四月 2024 14:01:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/dao/business/model/DispatchUnit.java | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/DispatchUnit.java b/server/service/src/main/java/com/doumee/dao/business/model/DispatchUnit.java
index 74a61c0..bf125e8 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/DispatchUnit.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/DispatchUnit.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -9,6 +10,7 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.util.List;
/**
* 娲鹃仯鍗曚綅淇℃伅琛�
@@ -31,7 +33,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +42,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -50,6 +52,15 @@
@ApiModelProperty(value = "鍚嶇О")
@ExcelColumn(name="鍚嶇О")
private String name;
+
+ @ApiModelProperty(value = "娲鹃仯鍗曚綅淇＄敤浠ｇ爜")
+ @ExcelColumn(name="娲鹃仯鍗曚綅淇＄敤浠ｇ爜")
+ private String code;
+
+
+ @ApiModelProperty(value = "娲鹃仯鍗曚綅鎻忚堪")
+ @ExcelColumn(name="娲鹃仯鍗曚綅鎻忚堪")
+ private String content;
@ApiModelProperty(value = "澶囨敞")
@ExcelColumn(name="澶囨敞")
@@ -83,9 +94,10 @@
@ExcelColumn(name="鑱旂郴浜�")
private String linkname;
+
@ApiModelProperty(value = "瀹℃牳鏃堕棿")
@ExcelColumn(name="瀹℃牳鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date checkDate;
@ApiModelProperty(value = "瀹℃牳澶囨敞")
@@ -108,4 +120,30 @@
@ExcelColumn(name="鍩鸿〃缂栫爜锛堣嚜鍏宠仈锛�")
private Integer baseId;
+
+
+ @ApiModelProperty(value = "鏂规涓婚敭")
+ @TableField(exist = false)
+ private Integer solutionId;
+
+ @ApiModelProperty(value = "娲鹃仯鍗曚綅鏂规绠″叧鑱斾俊鎭〃", example = "1")
+ @TableField(exist = false)
+ private List<DuSolution> duSolutionList;
+
+ @ApiModelProperty(value = "娲鹃仯鍗曚綅鎿嶄綔鍘嗗彶璁板綍琛�", example = "1")
+ @TableField(exist = false)
+ private List<DuLog> duLogList;
+
+
+ @ApiModelProperty(value = "娲鹃仯鍗曚綅鏂规绠″叧鑱斾富閿�")
+ @TableField(exist = false)
+ private Integer duSolutionId;
+
+ @ApiModelProperty(value = "浼佷笟鍚嶇О")
+ @TableField(exist = false)
+ private String companyName;
+
+ @ApiModelProperty(value = "娲鹃仯鍗曚綅涓嬬殑宸ョ淇℃伅")
+ @TableField(exist = false)
+ private List<Worktype> worktypeList;
}
--
Gitblit v1.9.3