From 20b08e98cf8e12f884ae329a16fa9cef44e64f9e Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期一, 01 四月 2024 15:58:40 +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 | 15 +++++++++++++-- 1 files changed, 13 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..4d2e6ba 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") @@ -126,4 +125,16 @@ @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; } -- Gitblit v1.9.3