From b92ca63c89b74404c3684f18c734d83531a9dd3f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 06 三月 2025 16:01:45 +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/ParkBook.java |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java
index 417ca14..d951617 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java
@@ -2,14 +2,14 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.util.Date;
 
 /**
@@ -29,7 +29,7 @@
 
     @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
     @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
-    private String creator;
+    private Integer creator;
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @ExcelColumn(name="鍒涘缓鏃堕棿")
@@ -80,12 +80,10 @@
 
     @ApiModelProperty(value = "寮�濮嬫椂闂�")
     @ExcelColumn(name="寮�濮嬫椂闂�")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date startTime;
 
     @ApiModelProperty(value = "缁撴潫鏃堕棿")
     @ExcelColumn(name="缁撴潫鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date endTime;
 
     @ApiModelProperty(value = "浜哄憳缂栫爜", example = "1")
@@ -106,7 +104,6 @@
 
     @ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
     @ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date hkDate;
 
 
@@ -135,9 +132,7 @@
     @TableField(exist = false)
     private String companyName;
     @ApiModelProperty(value = "鍋滆溅搴撴捣搴风紪鐮�", example = "1")
-    @ExcelColumn(name="鍋滆溅搴撴捣搴风紪鐮�")
     @TableField(exist = false)
     private String parkHkId;
-
 
 }

--
Gitblit v1.9.3