From 658ae28a31f1a8956893ff7b7b29d92c5fdb00f4 Mon Sep 17 00:00:00 2001 From: nidapeng <jp@doumee.com> Date: 星期三, 03 四月 2024 10:20:45 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1 --- server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java b/server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java index 3d5f275..dbdf314 100644 --- a/server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java +++ b/server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java @@ -11,6 +11,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; import java.math.BigDecimal; +import java.util.List; /** * 鍚堝苟鎶曚繚鍗曚俊鎭〃 @@ -33,7 +34,6 @@ @ApiModelProperty(value = "鍒涘缓鏃堕棿") @ExcelColumn(name="鍒涘缓鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") private Date createDate; @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1") @@ -42,7 +42,6 @@ @ApiModelProperty(value = "鏇存柊鏃堕棿") @ExcelColumn(name="鏇存柊鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1") @@ -108,6 +107,9 @@ @ApiModelProperty(value = "鍟嗘埛鍚嶇О", example = "1") @TableField(exist = false) private String companyName; + @ApiModelProperty(value = "琚繚闄╀汉浼佷笟鍚嶇О ,鍒嗗壊") + @TableField(exist = false) + private String companyNames; @ApiModelProperty(value = "鏂规鍚嶇О", example = "1") @TableField(exist = false) @@ -126,4 +128,30 @@ @ApiModelProperty(value = "鏈嶅姟澶╂暟") @TableField(exist = false) private Integer serviceDays; + + @ApiModelProperty(value = "鎶曚繚浜烘暟") + @TableField(exist = false) + private Integer insureNum; + @ApiModelProperty(value = "鐘舵�佸悕绉�") + @TableField(exist = false) + private String statusInfo; + + + @ApiModelProperty(value = "鏃ュ織璁板綍") + @TableField(exist = false) + private List<ApplyLog> applyLogList; + + @ApiModelProperty(value = "浜哄憳淇℃伅") + @TableField(exist = false) + private List<ApplyDetail> applyDetailList; + + @ApiModelProperty(value = "鎶曚繚鍗曞璞�") + @TableField(exist = false) + private Multifile toubaodanFile; + @ApiModelProperty(value = "鎶曚繚鍗曪紙宸茬缃诧級瀵硅薄") + @TableField(exist = false) + private Multifile toubaodanSignedFile; + @ApiModelProperty(value = "淇濋櫓鍗曞璞�") + @TableField(exist = false) + private Multifile baoxiandanFile; } -- Gitblit v1.9.3