From bc22a1fce8b936f61e1f799689ee5795fc2508b0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 17 一月 2024 15:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/dao/business/model/Solutions.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Solutions.java b/server/service/src/main/java/com/doumee/dao/business/model/Solutions.java
index 0a8201d..fb0f70a 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Solutions.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Solutions.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;
@@ -10,11 +11,12 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.math.BigDecimal;
+import java.util.List;
/**
* 淇濋櫓鏂规淇℃伅琛�
* @author 姹熻箘韫�
- * @date 2024/01/15 15:07
+ * @date 2024/01/16 10:03
*/
@Data
@ApiModel("淇濋櫓鏂规淇℃伅琛�")
@@ -92,9 +94,9 @@
@ExcelColumn(name="淇濋櫓鏃堕棿鍗曚綅0澶� 1鍗婃湀 2鏈� 3骞�")
private Integer timeUnit;
- @ApiModelProperty(value = "寮�鎴疯")
- @ExcelColumn(name="寮�鎴疯")
- private String insureCycle;
+ @ApiModelProperty(value = "鎶曚繚鍛ㄦ湡")
+ @ExcelColumn(name="鎶曚繚鍛ㄦ湡")
+ private Integer insureCycle;
@ApiModelProperty(value = "鏈�灏忔姇淇濆懆鏈熸椂闂村崟浣�0澶� 1鍗婃湀 2鏈� 3骞�", example = "1")
@ExcelColumn(name="鏈�灏忔姇淇濆懆鏈熸椂闂村崟浣�0澶� 1鍗婃湀 2鏈� 3骞�")
@@ -111,6 +113,9 @@
@ApiModelProperty(value = "鎺ユ敹鏂囦欢閭")
@ExcelColumn(name="鎺ユ敹鏂囦欢閭")
private String email;
+ @ApiModelProperty(value = "鎵垮寘鍏徃")
+ @ExcelColumn(name="鎵垮寘鍏徃")
+ private String companyName;
@ApiModelProperty(value = "鐗瑰埆绾﹀畾")
@ExcelColumn(name="鐗瑰埆绾﹀畾")
@@ -131,6 +136,9 @@
@ApiModelProperty(value = "鐗堟湰鍙�")
@ExcelColumn(name="鐗堟湰鍙�")
private String version;
+ @ApiModelProperty(value = "绛惧瓧浣嶇疆鍏抽敭瀛楋紝澶氫釜鑻辨枃閫楀彿闅斿紑")
+ @ExcelColumn(name="绛惧瓧浣嶇疆鍏抽敭瀛楋紝澶氫釜鑻辨枃閫楀彿闅斿紑")
+ private String signKeyword;
@ApiModelProperty(value = "璁板綍绫诲瀷 0鍩鸿〃鏁版嵁 1鍘嗗彶鐗堟湰鏁版嵁", example = "1")
@ExcelColumn(name="璁板綍绫诲瀷 0鍩鸿〃鏁版嵁 1鍘嗗彶鐗堟湰鏁版嵁")
@@ -140,4 +148,13 @@
@ExcelColumn(name="鍩鸿〃缂栫爜锛堣嚜鍏宠仈锛�")
private Integer baseId;
+
+ @ApiModelProperty(value = "宸ョ缂栫爜闆嗗悎", example = "1")
+ @TableField(exist = false)
+ private List<Integer> worktypeIdList;
+ @ApiModelProperty(value = "宸ョ鍏宠仈闆嗗悎", example = "1")
+ @TableField(exist = false)
+ private List<SolutionWorktype> worktypeList;
+
+
}
--
Gitblit v1.9.3