From 31b6aefacbee9dde61be6afcb7c6dbbf7c6baa7d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 02 Jan 2024 17:51:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/grid/entity/GridWorkLogEntity.java |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/grid/entity/GridWorkLogEntity.java b/src/main/java/org/springblade/modules/grid/entity/GridWorkLogEntity.java
index 9bf288f..fff1ab0 100644
--- a/src/main/java/org/springblade/modules/grid/entity/GridWorkLogEntity.java
+++ b/src/main/java/org/springblade/modules/grid/entity/GridWorkLogEntity.java
@@ -58,15 +58,32 @@
 	 */
 	@ApiModelProperty(value = "房屋编号")
 	private String houseCode;
+
 	/**
-	 * 走访人姓名
+	 * 走访类型
 	 */
-	@ApiModelProperty(value = "走访人姓名")
+	@ApiModelProperty(value = "走访类型")
+	private Integer type;
+	/**
+	 * 重点人员类型
+	 */
+	@ApiModelProperty(value = "重点人员类型")
+	private Integer personType;
+	/**
+	 * 被访人用户id
+	 */
+	@ApiModelProperty(value = "被访人用户id")
+	private Long householdId;
+
+	/**
+	 * 被访人姓名
+	 */
+	@ApiModelProperty(value = "被访人姓名")
 	private String name;
 	/**
-	 * 走访人电话
+	 * 被访人电话
 	 */
-	@ApiModelProperty(value = "走访人电话")
+	@ApiModelProperty(value = "被访人电话")
 	private String phone;
 	/**
 	 * 内容

--
Gitblit v1.9.3