From 2e1ac74716f62ca5712d0187cb7d7d25ee13efe5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 05 三月 2024 14:34:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 ed07e3a..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
@@ -67,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")
@@ -82,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