From cdd6551b190b981b807a3b95e9635c559ccc769d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 19 五月 2025 09:45:07 +0800
Subject: [PATCH] git ch

---
 server/service/src/main/java/com/doumee/dao/business/model/DuSolution.java |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/dao/business/model/DuSolution.java b/server/service/src/main/java/com/doumee/dao/business/model/DuSolution.java
index 2d9cd12..cd071e2 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/DuSolution.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/DuSolution.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,11 +10,12 @@
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 娲鹃仯鍗曚綅鏂规绠″叧鑱斾俊鎭〃
  * @author 姹熻箘韫�
- * @date 2024/01/15 15:07
+ * @date 2024/01/16 10:03
  */
 @Data
 @ApiModel("娲鹃仯鍗曚綅鏂规绠″叧鑱斾俊鎭〃")
@@ -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")
@@ -69,7 +71,7 @@
 
     @ApiModelProperty(value = "瀹℃牳鏃堕棿")
     @ExcelColumn(name="瀹℃牳鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+
     private Date checkDate;
 
     @ApiModelProperty(value = "瀹℃牳澶囨敞")
@@ -80,4 +82,13 @@
     @ExcelColumn(name="瀹℃牳浜虹紪鐮侊紙鍏宠仈system_user)")
     private Integer checkUserId;
 
+    @ApiModelProperty(value = "鏂规鍚嶇О")
+    @TableField(exist = false)
+    private String solutionName;
+
+
+    @ApiModelProperty(value = "娲鹃仯鍗曚綅鏂规绠″伐绉嶅叧鑱斾俊鎭〃", example = "1")
+    @TableField(exist = false)
+    private List<DuWorktype> duWorktypeList;
+
 }

--
Gitblit v1.9.3