From 553831c82c2e8f8ff7b230c4d536cf99c47ece5b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 18 一月 2024 18:33:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/dao/business/model/DuSolution.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 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 6fab539..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,6 +10,7 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.util.List;
/**
* 娲鹃仯鍗曚綅鏂规绠″叧鑱斾俊鎭〃
@@ -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