From 6e41324f84f0cf70871ca05292c5420bdcaaa98c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 04 二月 2024 14:36:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java | 4 ++--
1 files changed, 2 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..33b3c79 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,7 +222,7 @@
@ApiModelProperty(value = "淇濋櫓鐢熸晥璧锋湡")
@TableField(exist = false)
private Date baoxianStartTime;
- @ApiModelProperty(value = "淇濋櫓鐢熸晥璧锋湡")
+ @ApiModelProperty(value = "淇濋櫓鐢熸晥姝㈡湡")
@TableField(exist = false)
private Date baoxianEndTime;
--
Gitblit v1.9.3