From 44a0ef1620cad87479390900eb6ded041c7b8d7b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 17 五月 2024 16:56:31 +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/InsuranceApply.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
index 65b1e31..4bce582 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
@@ -147,6 +147,14 @@
     @ExcelColumn(name="浜哄憳鍚嶅崟绛剧讲鍚堝悓鍙�")
     private String signMemberListNo;
 
+
+    @ApiModelProperty(value = "鍛ㄦ湡缁撴潫鏃ユ湡 锛�2022-02-02 23:59:59锛�")
+    @ExcelColumn(name="鍛ㄦ湡缁撴潫鏃ユ湡 锛�2022-02-02 23:59:59锛�")
+//    @DateTimeFormat(pattern = "yyyy-MM-dd")
+//    @JsonFormat(pattern="yyyy-MM-dd")
+    private Date finalEndTime;
+
+
     @ApiModelProperty(value = "浼佷笟鍚嶇О")
     @TableField(exist = false)
     private String companyName;

--
Gitblit v1.9.3