From 81d7f91fa38e74cab052eb4413bd3e12686935a4 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期一, 26 五月 2025 14:07:34 +0800 Subject: [PATCH] git ch --- server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java index ae7178e..385b94c 100644 --- a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java +++ b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java @@ -4,6 +4,7 @@ import com.doumee.core.annotation.excel.ExcelColumn; import com.doumee.dao.business.vo.CompensationVO; import com.doumee.dao.business.vo.SettleClaimsMoneyVO; +import com.doumee.dao.business.vo.SettleParentStatusVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import com.baomidou.mybatisplus.annotation.IdType; @@ -183,6 +184,9 @@ @ApiModelProperty(value = "鏄惁寰呰ˉ鍏呮潗鏂�:0=鍚︼紱1=鏄�") private Integer waitSupplement; + @ApiModelProperty(value = "琛ュ厖鏉愭枡璇存槑") + private String waitSupplementInfo; + @ApiModelProperty(value = "璐圭敤鏄惁鍙戠敓鍙樻洿:0=鍚︼紱1=鏄紱") private Integer feeUpdate; @@ -199,6 +203,12 @@ @ApiModelProperty(value = "鏍歌禂鍏朵粬閲戦") private BigDecimal hpOtherAccount; + + @ApiModelProperty(value = "璇︾粏鍦板潃") + private String address; + + @ApiModelProperty(value = "淇濆崟鏄庣粏琛屼富閿�") + private Integer applyDetailId; @ApiModelProperty(value = "璧斿伩閲戦") @TableField(exist = false) @@ -244,6 +254,11 @@ @ApiModelProperty(value = "鍏朵粬璧勬枡") @TableField(exist = false) private List<Multifile> otherFileList; + + @ApiModelProperty(value = "琛ュ厖璇存槑鏂囦欢") + @TableField(exist = false) + private List<Multifile> supplementFileList; + @ApiModelProperty(value = "鎵撴鍑瘉") @TableField(exist = false) @@ -307,9 +322,15 @@ @TableField(exist = false) private List<CompensationVO> accountList; + @ApiModelProperty(value = "娴佺▼璇︽儏淇℃伅", example = "1") + @TableField(exist = false) + private List<SettleParentStatusVO> parentStatusVOList; @ApiModelProperty(value = "鎶ユ鏃堕棿 鏌ヨ浣跨敤 yyyy-MM-dd") @TableField(exist = false) private String createDateStr; + @ApiModelProperty(value = "娴佺▼鑰楁椂",hidden = true) + @TableField(exist = false) + private Integer totalHours; } -- Gitblit v1.9.3