From efcdc8c49b0452d9c7f192ab351da09bf8aafc80 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 27 五月 2024 18:34:58 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
index 077a8ad..bf78546 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
@@ -78,7 +78,6 @@
private String name;
@ApiModelProperty(value = "璁垮骞撮緞")
@ExcelColumn(name="璁垮骞撮緞")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date birthday;
@ApiModelProperty(value = "鎵嬫満鍙�")
@ExcelColumn(name="鎵嬫満鍙�")
@@ -154,7 +153,6 @@
@ApiModelProperty(value = "鍒濆鏃堕棿")
@ExcelColumn(name="鍒濆鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date checkDate;
@ApiModelProperty(value = "鍒濆澶囨敞")
@@ -167,7 +165,6 @@
@ApiModelProperty(value = "缁堝鏃堕棿")
@ExcelColumn(name="缁堝鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date endCheckDate;
@ApiModelProperty(value = "缁堝澶囨敞")
@@ -215,7 +212,6 @@
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date hkDate;
@ApiModelProperty(value = "ERP鐢宠璁板綍缂栫爜")
@@ -234,6 +230,10 @@
@ApiModelProperty(value = "鏉ユ簮绫诲瀷锛�0=鏈郴缁燂紱1=ERP", example = "1")
private Integer sourceType;
+ @ApiModelProperty(value = "鏂藉伐浜嬬敱")
+ @ExcelColumn(name="鏂藉伐浜嬬敱")
+ private String constructionReason;
+
@ApiModelProperty(value = "鏅�氳瀹㈢敵璇烽殢璁夸汉鍛�")
@TableField(exist = false)
private List<Visits> withUserList;
--
Gitblit v1.9.3