From 75e493d0aa727b99134bf442d8c49191fc613681 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 11 三月 2024 12:12:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java
index bc37b58..7e319a5 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java
@@ -32,16 +32,14 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
@ExcelColumn(name="鏇存柊浜虹紪鐮�")
- private String edirot;
+ private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -132,5 +130,9 @@
@ExcelColumn(name="閮ㄩ棬")
@TableField(exist = false)
private String companyName;
+ @ApiModelProperty(value = "鍋滆溅搴撴捣搴风紪鐮�", example = "1")
+ @ExcelColumn(name="鍋滆溅搴撴捣搴风紪鐮�")
+ @TableField(exist = false)
+ private String parkHkId;
}
--
Gitblit v1.9.3