From e856339c5eef51276d64956f2e3f64386f75ce66 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 04 二月 2024 16:12:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/dao/business/model/Solutions.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 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 4e36fe9..771b7c1 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
@@ -128,6 +128,9 @@
@ApiModelProperty(value = "鍏朵粬璇存槑")
@ExcelColumn(name="鍏朵粬璇存槑")
private String ortherInfo;
+ @ApiModelProperty(value = "绛剧珷鍏抽敭瀛楋紝澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑")
+ @ExcelColumn(name="绛剧珷鍏抽敭瀛楋紝澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑")
+ private String signKeyword;
@ApiModelProperty(value = "鎵�灞炴柟妗堝熀琛ㄧ紪鐮�(solution_base_id)", example = "1")
@ExcelColumn(name="鎵�灞炴柟妗堝熀琛ㄧ紪鐮�(solution_base_id)")
@@ -136,9 +139,6 @@
@ApiModelProperty(value = "鐗堟湰鍙�")
@ExcelColumn(name="鐗堟湰鍙�")
private String version;
- @ApiModelProperty(value = "绛惧瓧浣嶇疆鍏抽敭瀛楋紝澶氫釜鑻辨枃閫楀彿闅斿紑")
- @ExcelColumn(name="绛惧瓧浣嶇疆鍏抽敭瀛楋紝澶氫釜鑻辨枃閫楀彿闅斿紑")
- private String signKeyword;
@ApiModelProperty(value = "璁板綍绫诲瀷 0鍩鸿〃鏁版嵁 1鍘嗗彶鐗堟湰鏁版嵁", example = "1")
@ExcelColumn(name="璁板綍绫诲瀷 0鍩鸿〃鏁版嵁 1鍘嗗彶鐗堟湰鏁版嵁")
@@ -148,16 +148,20 @@
@ExcelColumn(name="鍩鸿〃缂栫爜锛堣嚜鍏宠仈锛�")
private Integer baseId;
+ @ApiModelProperty(value = "寤惰繜澶╂暟鐢熸晥锛圴ALID_TYPE锛�0 浣跨敤锛�", example = "1")
+ @ExcelColumn(name="寤惰繜澶╂暟鐢熸晥锛圴ALID_TYPE锛�0 浣跨敤锛�")
+ private Integer validTypeNum;
+
@ApiModelProperty(value = "鍛樺伐", example = "1")
@TableField(exist = false)
private Integer memberId;
-
+ @ApiModelProperty(value = "淇濋櫓鍏徃鍚嶇О", example = "1")
+ @TableField(exist = false)
+ private String insuranceName;
@ApiModelProperty(value = "淇濆崟涓婚敭", example = "1")
@TableField(exist = false)
private Integer applyId;
-
-
@ApiModelProperty(value = "宸ョ缂栫爜闆嗗悎", example = "1")
@TableField(exist = false)
@@ -166,5 +170,8 @@
@TableField(exist = false)
private List<SolutionWorktype> worktypeList;
+ @ApiModelProperty(value = "鎬诲懆鏈熻垂鐢�", example = "1")
+ @TableField(exist = false)
+ private BigDecimal cyclePrice;
}
--
Gitblit v1.9.3