From 7cdea6d16a8b9f74800792ea412ad8b51c4df7f4 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 22 十月 2024 17:48:38 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitPark.java | 40 +++++++++++++++++++++++++++++++--------- 1 files changed, 31 insertions(+), 9 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 62bdfb4..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,5 +1,6 @@ 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; @@ -32,7 +33,6 @@ @ApiModelProperty(value = "鍒涘缓鏃堕棿") @ExcelColumn(name="鍒涘缓鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") private Date createDate; @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1") @@ -41,7 +41,6 @@ @ApiModelProperty(value = "鏇存柊鏃堕棿") @ExcelColumn(name="鏇存柊鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1") @@ -68,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