From 481f30f83f86721d913616f221f7bb74f684b6a0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 27 二月 2024 17:34:29 +0800
Subject: [PATCH] ERP接口
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
index 61c681a..43185bf 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
@@ -59,13 +59,12 @@
@ApiModelProperty(value = "浜鸿劯鐓х墖")
@ExcelColumn(name="浜鸿劯鐓х墖")
private String faceImg;
-
@ApiModelProperty(value = "鍋ュ悍鐮�")
@ExcelColumn(name="鍋ュ悍鐮�")
private String imgurl;
- @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐")
- @ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐")
+ @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐 3杞﹁締淇℃伅")
+ @ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐 3杞﹁締淇℃伅")
private Integer type;
@ApiModelProperty(value = "璁垮鍚嶇О")
@@ -104,7 +103,7 @@
private String deviceIndex;
@ApiModelProperty(value = "鍏ュ巶鏃堕棿")
@ExcelColumn(name="鍏ュ巶鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date eventDate;
@ApiModelProperty(value = "璁垮ID(鍏宠仈member)")
@@ -115,10 +114,20 @@
@ExcelColumn(name="浜嬩欢绫诲瀷鐮�")
private String eventCode;
+
+ @ApiModelProperty(value = "杞︾墝鍙凤紙type=3浣跨敤锛�")
+ @ExcelColumn(name="杞︾墝鍙凤紙type=3浣跨敤锛�")
+ private String carNo;
+
@ApiModelProperty(value = "鍏徃缁勭粐")
@ExcelColumn(name="鍏徃缁勭粐")
@TableField(exist = false)
public String companyName;
+
+ @ApiModelProperty(value = "璁垮缁勭粐鍚嶇О")
+ @ExcelColumn(name="璁垮缁勭粐鍚嶇О")
+ @TableField(exist = false)
+ public String visitCompanyName;
// 鏉′欢鏌ヨ鍙傛暟
@@ -133,5 +142,9 @@
@ApiModelProperty(value = "缁撴潫鏃堕棿")
@TableField(exist = false)
private Date endTime;
+ @ApiModelProperty(value = "浜鸿劯鐓х墖")
+ @TableField(exist = false)
+ private String faceImgFull;
+
}
--
Gitblit v1.9.3