From cc01607ad15fa69ad52bc0c81e8cfdc4b7effed8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 30 五月 2025 17:16:09 +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/SettleClaims.java | 16 ++++++++++++++++
1 files changed, 16 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 385b94c..b1fbc38 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
@@ -210,6 +210,11 @@
@ApiModelProperty(value = "淇濆崟鏄庣粏琛屼富閿�")
private Integer applyDetailId;
+ @ApiModelProperty(value = "鎶ユ鏃堕棿")
+ @TableField(exist = false)
+ private Date reportDate;
+
+
@ApiModelProperty(value = "璧斿伩閲戦")
@TableField(exist = false)
@ExcelColumn(name="璧斿伩閲戦",index = 10,width = 16)
@@ -333,4 +338,15 @@
@ApiModelProperty(value = "娴佺▼鑰楁椂",hidden = true)
@TableField(exist = false)
private Integer totalHours;
+
+
+ @ApiModelProperty(value = "鎷掔粷閫�鍥炴棩蹇�")
+ @TableField(exist = false)
+ private SettleClaimsLog refuseSettleClaimsLog;
+
+ @ApiModelProperty(value = "琛ュ厖璇存槑鏃ュ織")
+ @TableField(exist = false)
+ private SettleClaimsLog supplementSettleClaimsLog;
+
+
}
--
Gitblit v1.9.3