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/VisitEvent.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java
index caa2824..e1c9f8a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.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;
/**
@@ -121,6 +121,8 @@
@ApiModelProperty(value = "杞︾墝鍙�")
@ExcelColumn(name="杞︾墝鍙�",index = 5,width = 16)
private String carNo;
+ @ApiModelProperty(value = "璁垮鍗曞彿")
+ private String invoicesNo;
@ApiModelProperty(value = "鐓х墖uri")
private String photoUrl;
@@ -158,7 +160,9 @@
@TableField(exist = false)
@ExcelColumn(name="浜嬩欢绫诲瀷",index = 8,width = 16)
private String eventTypeName;
-
+ @ApiModelProperty(value = "杩涘嚭绫诲瀷 1,#杩涘嚭绫诲瀷锛�1杩涘叆2鍑哄幓")
+ @ExcelColumn(name="杩涘嚭绫诲瀷",index = 12,width = 8,valueMapping = "0=杩�;1=鍑�")
+ private String inOrOut;// 1,#杩涘嚭绫诲瀷锛�1杩涘叆2鍑哄幓
@ApiModelProperty(value = "鎶撴媿鍥緐ri瀹屾暣")
@TableField(exist = false)
private String captureUrlFull;
--
Gitblit v1.9.3