From f7fb92466e70972e8d5e8ae7dc7533a7c37a8873 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 11 九月 2024 17:39:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java
index 9a2bebb..2a659c6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java
@@ -1,10 +1,13 @@
package com.doumee.dao.web.response;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.dao.business.model.Visits;
+import com.doumee.dao.business.vo.ApproveDataVO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.Date;
import java.util.List;
/**
@@ -15,9 +18,16 @@
*/
@Data
public class VisitDetailVO {
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
- @ApiModelProperty(value = "瀹℃壒鐘舵��")
+ @ApiModelProperty(value = "瀹℃牳鐘舵�� 0寰呭鏍� 1瀹℃壒涓� 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触 7鎷滆涓� 8宸茬绂�")
private Integer status;
+
+ @ApiModelProperty(value = "涓氬姟瀹℃牳鐘舵�� 0寰呭鏍� 1瀹℃壒涓� 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 ", example = "1")
+ @ExcelColumn(name="瀹℃牳鐘舵�� 0寰呭鏍� 1瀹℃壒涓� 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 ")
+ private Integer businessStatus;
+
@ApiModelProperty(value = "琚浜哄悕绉�")
private String visitUserName;
@@ -65,7 +75,17 @@
@ApiModelProperty(value = "璁垮浜岀淮鐮�")
private String qrcode;
+ @ApiModelProperty(value = "绫诲瀷 0闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 1鏂藉伐浜哄憳璁垮鐢宠 2璁垮鎶ュ", example = "1")
+ private Integer type;
+ @ApiModelProperty(value = "鏂藉伐浜嬬敱")
+ private String constructionReason;
+
+ @ApiModelProperty(value = "瀹℃壒淇℃伅鏁版嵁")
+ private ApproveDataVO approveDateVO;
+
+ @ApiModelProperty(value = "璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収", example = "1")
+ private Integer idcardType;
}
--
Gitblit v1.9.3