From 05cf6324ea8322164d99a3d3d4161fe374534b3b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 18 二月 2024 15:22:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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..3fca376 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")
@@ -80,4 +82,13 @@
@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