From 870dfdba90fc4062b66de669ad9ff3f4707bf496 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期一, 09 六月 2025 10:32:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1 --- server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java b/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java index 2fadde3..c4e3c2e 100644 --- a/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java +++ b/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java @@ -142,7 +142,7 @@ @TableField(exist = false) private String validCode; - @ApiModelProperty(value = "淇濋殰鐘舵�侊細0=淇濋殰涓紱1=涓嶅湪淇�") + @ApiModelProperty(value = "淇濋殰鐘舵�侊細-1=鐢宠涓紱0=淇濋殰涓紱1=涓嶅湪淇濓紱2=鏈敓鏁�") @TableField(exist = false) private Integer applyStatus; @@ -184,4 +184,14 @@ @ApiModelProperty(value = "琛屼繚闄╃敓鏁堣捣鏈�") @TableField(exist = false) private Date parentStartTime; + + @ApiModelProperty(value = "鏂规鍩虹鐗堟湰涓婚敭", example = "1") + @TableField(exist = false) + private Integer solutionBaseId; + + + @ApiModelProperty(value = "鎵�灞炰繚闄╁叕鍙哥紪鐮侊紙insurance锛�", example = "1") + @TableField(exist = false) + private Integer insuranceId; + } -- Gitblit v1.9.3