From 86df83fdc701b71b9b130ce54fc027c5a78050fb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 27 十一月 2024 16:43:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java
index e7ecb22..e232d46 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java
@@ -75,14 +75,17 @@
@ApiModelProperty(value = "绛捐鏃ユ湡")
@ExcelColumn(name="绛捐鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date signDate;
@ApiModelProperty(value = "寮�濮嬫棩鏈�")
@ExcelColumn(name="寮�濮嬫棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date startDate;
@ApiModelProperty(value = "缁撴潫鏃ユ湡")
@ExcelColumn(name="缁撴潫鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date endDate;
@ApiModelProperty(value = "椤圭洰缂栫爜锛堝叧鑱攜w_project)", example = "1")
@@ -126,6 +129,7 @@
@ApiModelProperty(value = "閫�绉熸棩鏈�")
@ExcelColumn(name="閫�绉熸棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date btDate;
@ApiModelProperty(value = "閫�绉熺粡鍔炰汉缂栫爜", example = "1")
@@ -134,6 +138,7 @@
@ApiModelProperty(value = "閫�绉熺鍒版棩鏈�")
@ExcelColumn(name="閫�绉熺鍒版棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date btSignDate;
@ApiModelProperty(value = "閫�绉熺粨绠楅噾棰濆悎璁�", example = "1")
@@ -161,10 +166,12 @@
@ApiModelProperty(value = "绉熻祦鍏嶇鏈熷紑濮嬫棩鏈�")
@ExcelColumn(name="绉熻祦鍏嶇鏈熷紑濮嬫棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date zlFreeStartDate;
@ApiModelProperty(value = "绉熻祦鍏嶇鏈熺粨鏉熸棩鏈�")
@ExcelColumn(name="绉熻祦鍏嶇鏈熺粨鏉熸棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date zlFreeEndDate;
@ApiModelProperty(value = "鐗╀笟鎶奸噾锛堝厓锛�", example = "1")
@@ -177,10 +184,12 @@
@ApiModelProperty(value = "鐗╀笟鍏嶇鏈熷紑濮嬫棩鏈�")
@ExcelColumn(name="鐗╀笟鍏嶇鏈熷紑濮嬫棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date wyFreeStartDate;
@ApiModelProperty(value = "鐗╀笟鍏嶇鏈熺粨鏉熸棩鏈�")
@ExcelColumn(name="鐗╀笟鍏嶇鏈熺粨鏉熸棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date wyFreeEndDate;
@ApiModelProperty(value = "绉熻祦鎬婚噾棰�", example = "1")
--
Gitblit v1.9.3