From d4acc07a28e2bbeb25f097148bbbfe4b3356b9f9 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期二, 27 二月 2024 14:36:49 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java | 4 +--- 1 files changed, 1 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 08f2fb6..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") -- Gitblit v1.9.3