From bd57081dc1bcd94e1e4043a9e0a7c6953d4bb9d4 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 01 四月 2024 19:19:01 +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/SettleClaims.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 a32df91..da6a49b 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
@@ -152,7 +152,7 @@
@ApiModelProperty(value = "鍑洪櫓鍦板尯(鍏宠仈areas)", example = "1")
@ExcelColumn(name="鍑洪櫓鍦板尯(鍏宠仈areas)")
- private Integer areaId;
+ private String areaId;
@ApiModelProperty(value = "鍑洪櫓鍦板尯鍚嶇О锛堢渷甯傦級")
@ExcelColumn(name="鍑洪櫓鍦板尯鍚嶇О锛堢渷甯傦級")
@@ -222,10 +222,14 @@
@ApiModelProperty(value = "淇濋櫓鐢熸晥璧锋湡")
@TableField(exist = false)
private Date baoxianStartTime;
- @ApiModelProperty(value = "淇濋櫓鐢熸晥璧锋湡")
+ @ApiModelProperty(value = "淇濋櫓鐢熸晥姝㈡湡")
@TableField(exist = false)
private Date baoxianEndTime;
+ @ApiModelProperty(value = "璧勬枡瀹屾垚鏃堕棿")
+ @TableField(exist = false)
+ private Date finishDate;
+
@ApiModelProperty(value = "鏂规鍩鸿〃缂栫爜锛堝叧鑱攕olutions锛�", example = "1")
@TableField(exist = false)
--
Gitblit v1.9.3