From 3a992a2be8c1cc815719ac76cd7242dd7a2f7c2d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 27 八月 2024 17:33:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarParks.java | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarParks.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarParks.java
index 1747d16..7cd9ff9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarParks.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarParks.java
@@ -64,7 +64,6 @@
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date hkDate;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
@@ -73,7 +72,6 @@
@ApiModelProperty(value = "杞﹀簱鍒涘缓鏃堕棿")
@ExcelColumn(name="杞﹀簱鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date parkCreateDate;
@ApiModelProperty(value = "鐖惰溅搴撶紪鐮�", example = "1")
@@ -82,7 +80,6 @@
@ApiModelProperty(value = "杞﹀簱鏇存柊鏃堕棿")
@ExcelColumn(name="杞﹀簱鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date parkEditDate;
@ApiModelProperty(value = "ERP鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触", example = "1")
@@ -91,7 +88,6 @@
@ApiModelProperty(value = "ERP鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="ERP鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date erpDate;
@ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤", example = "1")
--
Gitblit v1.9.3