From 0cc80c49603bb63b6ff348e5743cb5bb4801de7a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 22 十二月 2023 13:46:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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 37ec7ac..61c681a 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
@@ -95,7 +95,7 @@
@ApiModelProperty(value = "鐝")
@ExcelColumn(name="鐝")
- private String classes;
+ private Integer classes;
@ApiModelProperty(value = "娴峰悍闂ㄧ鍚嶇О")
@ExcelColumn(name="娴峰悍闂ㄧ鍚嶇О")
private String deviceName;
@@ -120,4 +120,18 @@
@TableField(exist = false)
public String companyName;
+
+ // 鏉′欢鏌ヨ鍙傛暟
+ @ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�")
+ @TableField(exist = false)
+ private String keyWords;
+
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @TableField(exist = false)
+ private Date startTime;
+
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @TableField(exist = false)
+ private Date endTime;
+
}
--
Gitblit v1.9.3