From 22271e641e4505ba906c3770905b7e84e3ad8d85 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 02 四月 2024 17:05:57 +0800
Subject: [PATCH] mrshi

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

diff --git a/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java b/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java
index c634acc..55a59c9 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java
@@ -9,6 +9,8 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
@@ -20,7 +22,7 @@
 @Data
 @ApiModel("浼佷笟鍙敤淇濋櫓鏂规鍏宠仈琛�")
 @TableName("`company_solution`")
-public class CompanySolution {
+public class CompanySolution implements Serializable {
 
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "涓婚敭", example = "1")
@@ -65,8 +67,8 @@
     @ExcelColumn(name="鎺掑簭鐮�")
     private Integer sortnum;
 
-    @ApiModelProperty(value = "鏂规缂栫爜锛堝叧鑱攕olutions锛�", example = "1")
-    @ExcelColumn(name="鏂规缂栫爜锛堝叧鑱攕olutions锛�")
+    @ApiModelProperty(value = "鏂规缂栫爜锛堝叧鑱攕olutions锛� 鍩鸿〃鏁版嵁", example = "1")
+    @ExcelColumn(name="鏂规缂栫爜锛堝叧鑱攕olutions锛夊熀琛ㄦ暟鎹�")
     private Integer solutionBaseId;
 
     @ApiModelProperty(value = "鏄惁鍙姞淇� 0鍚� 1鏄�", example = "1")
@@ -80,4 +82,15 @@
     @TableField(exist = false)
     private String solutionName  ;
 
+
+    @ApiModelProperty(value = "鏂规涓婚敭锛堝叧鑱攕olutions锛�", example = "1")
+    @ExcelColumn(name="鏂规涓婚敭锛堝叧鑱攕olutions锛�")
+    private Integer solutionId;
+
+
+    @ApiModelProperty(value = "鏂规瀵硅薄", example = "1")
+    @TableField(exist = false)
+    private Solutions solution;
+
+
 }

--
Gitblit v1.9.3