From 277f2d65a70bddbf9c571e2023315faad26e12d0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 18 三月 2024 14:11:44 +0800
Subject: [PATCH] Merge branch 'master' into 1.0.1
---
server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
index 8732783..36ade21 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
@@ -104,6 +104,9 @@
@ApiModelProperty(value = "鏈�杩戞搷浣滀汉缂栫爜锛堝叧鑱攕ystem_user)", example = "1")
@ExcelColumn(name="鏈�杩戞搷浣滀汉缂栫爜锛堝叧鑱攕ystem_user)")
private Integer checkUserId;
+ @ApiModelProperty(value = "鍚堝苟鍗曠紪鐮侊紙鍏宠仈union_apply)", example = "1")
+ @ExcelColumn(name="鍚堝苟鍗曠紪鐮侊紙鍏宠仈union_apply)")
+ private Integer unionApplyId;
@ApiModelProperty(value = "鍗曞彿")
@ExcelColumn(name="鍗曞彿")
@@ -131,6 +134,9 @@
@ApiModelProperty(value = "鏂规鍚嶇О")
@TableField(exist = false)
private String solutionsName;
+ @ApiModelProperty(value = "鏂规绫诲瀷 0鐩翠繚 1濮旀墭鎶曚繚")
+ @TableField(exist = false)
+ private Integer solutionType;
@ApiModelProperty(value = "鏂规閭欢")
@TableField(exist = false)
private String solutionEmail;
@@ -208,6 +214,9 @@
@TableField(exist = false)
private Integer timeUnit;
+ @ApiModelProperty(value = "鏂规鍩虹鐗堟湰涓婚敭", example = "1")
+ @TableField(exist = false)
+ private Integer solutionBaseId;
@ApiModelProperty(value = "鏈�鏂扮増鏈殑鏂规涓婚敭", example = "1")
@TableField(exist = false)
--
Gitblit v1.9.3