From 6e41324f84f0cf70871ca05292c5420bdcaaa98c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 04 二月 2024 14:36:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/dao/business/model/Solutions.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 4deeefd..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
@@ -148,6 +148,10 @@
@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;
@@ -155,12 +159,9 @@
@TableField(exist = false)
private String insuranceName;
-
@ApiModelProperty(value = "淇濆崟涓婚敭", example = "1")
@TableField(exist = false)
private Integer applyId;
-
-
@ApiModelProperty(value = "宸ョ缂栫爜闆嗗悎", example = "1")
@TableField(exist = false)
@@ -169,5 +170,8 @@
@TableField(exist = false)
private List<SolutionWorktype> worktypeList;
+ @ApiModelProperty(value = "鎬诲懆鏈熻垂鐢�", example = "1")
+ @TableField(exist = false)
+ private BigDecimal cyclePrice;
}
--
Gitblit v1.9.3