From a6d6627a6e13aef60941337a270541f507d53ba7 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 15 十二月 2023 09:36:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 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 00540e4..62fb83f 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
@@ -96,7 +96,12 @@
@ApiModelProperty(value = "鐝")
@ExcelColumn(name="鐝")
private String classes;
-
+ @ApiModelProperty(value = "娴峰悍闂ㄧ鍚嶇О")
+ @ExcelColumn(name="娴峰悍闂ㄧ鍚嶇О")
+ private String deviceName;
+ @ApiModelProperty(value = "娴峰悍闂ㄧ缂栫爜")
+ @ExcelColumn(name="娴峰悍闂ㄧ缂栫爜")
+ private String deviceIndex;
@ApiModelProperty(value = "鍏ュ巶鏃堕棿")
@ExcelColumn(name="鍏ュ巶鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@@ -115,13 +120,15 @@
@TableField(exist = false)
public String companyName;
- @ApiModelProperty(value = "璁垮鐢ㄦ埛绫诲瀷")
- @ExcelColumn(name="璁垮鐢ㄦ埛绫诲瀷")
- @TableField(exist = false)
- private Integer memberType;
- @ApiModelProperty(value = "闂ㄧ鍚嶇О")
- @ExcelColumn(name="闂ㄧ鍚嶇О")
- @TableField(exist = false)
- private String srcName;
+ // 鏉′欢鏌ヨ鍙傛暟
+ @ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�")
+ private String keyWords;
+
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ private Date startTime;
+
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ private Date endTime;
+
}
--
Gitblit v1.9.3