From 8bd6e0f1c84f2bc5bf2b9555d1c5fb388565db6c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 11 十二月 2024 19:17:12 +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/VisitPark.java | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitPark.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitPark.java
index 3923e9a..ed90548 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitPark.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitPark.java
@@ -1,6 +1,8 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -18,7 +20,7 @@
@Data
@ApiModel("璁垮鎶ュ鍋滆溅搴撳叧鑱旇〃")
@TableName("`visit_park`")
-public class VisitPark {
+public class VisitPark extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -31,7 +33,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +41,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -67,31 +67,54 @@
@ExcelColumn(name="杞︾墝鍙�")
private String carCode;
- @ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
+ @ApiModelProperty(value = "娴峰悍鏍囪瘑 棰勭害鏍囪瘑 reserveOrderNo", example = "1")
@ExcelColumn(name="娴峰悍鏍囪瘑")
- private Integer hkId;
+ private String hkId;
- @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触", example = "1")
- @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触")
+ @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 3宸插彇娑�", example = "1")
+ @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 3宸插彇娑�")
private Integer hkStatus;
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date hkDate;
@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 = "鍋滆溅搴撴捣搴风紪鐮�")
@ExcelColumn(name="鍋滆溅搴撴捣搴风紪鐮�")
private String parkHkId;
+ @ApiModelProperty(value = "涓氬姟绫诲瀷锛�0=璁垮鎶ュ锛�1=鏈堝彴鐗╂祦杞�", example = "1")
+ @ExcelColumn(name="涓氬姟绫诲瀷锛�0=璁垮鎶ュ锛�1=鏈堝彴鐗╂祦杞�")
+ private Integer objType;
+
+ @ApiModelProperty(value = "鍋滆溅鍦哄悕绉�", example = "1")
+ @TableField(exist = false)
+ private String parksName;
+
+ @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳", example = "1")
+ @TableField(exist = false)
+ private Integer memberType;
+
+ @ApiModelProperty(value = "濮撳悕", example = "1")
+ @TableField(exist = false)
+ private String memberName;
+
+ @ApiModelProperty(value = "鎵嬫満鍙�", example = "1")
+ @TableField(exist = false)
+ private String memberPhone;
+
+ @ApiModelProperty(value = "閮ㄩ棬", example = "1")
+ @TableField(exist = false)
+ private String companyName;
+
+
+
}
--
Gitblit v1.9.3