From 4f2a2b480f1d36782c315881bad50066a52e71aa Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 04 二月 2024 14:11:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyQueryDTO.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyQueryDTO.java b/server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyQueryDTO.java
index e55323e..1c7a4d1 100644
--- a/server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyQueryDTO.java
+++ b/server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyQueryDTO.java
@@ -28,27 +28,35 @@
private Integer baseSolutionId;
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥姝㈡湡寮�濮�")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date endTimeS;
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥姝㈡湡缁撴潫")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date endTimeE;
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥璧锋湡寮�濮�")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date startTimeS;
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥璧锋湡缁撴潫")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date startTimeE;
@ApiModelProperty(value = "鍗曞彿")
private String code;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "鎻愪氦鏃ユ湡寮�濮�")
private Date createTimeS;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "鎻愪氦鏃ユ湡缁撴潫")
private Date createTimeE;
@@ -63,6 +71,6 @@
@ApiModelProperty(value = "鍗冲皢澶辨晥璁㈠崟锛�0=鍚︼紱1=鏄�")
private Integer loseEfficacy;
- @ApiModelProperty(value = "鐘舵�� 0寰呭鎵� 1寰呭嚭鍗� 2淇濋殰涓� 3宸茶繃鏈� 4宸叉挙鍥� 5閫�鍥炵敵璇蜂腑 6宸插叧闂�", example = "1")
+ @ApiModelProperty(value = "鐘舵�� 0寰呭鏍� 1寰呭嚭鍗� 2淇濋殰涓� 3宸茶繃鏈� 4宸叉挙鍥� 5閫�鍥炵敵璇蜂腑 6宸插叧闂�", example = "1")
private Integer statusCollect;
}
--
Gitblit v1.9.3