From c4fb77c78f0617abdf117ca135dfee519f0bca51 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 03 Jan 2024 18:13:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/grid/entity/GridWorkLogEntity.java |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 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 2221206..66e4b8b 100644
--- a/src/main/java/org/springblade/modules/grid/entity/GridWorkLogEntity.java
+++ b/src/main/java/org/springblade/modules/grid/entity/GridWorkLogEntity.java
@@ -32,7 +32,6 @@
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 import org.springframework.format.annotation.DateTimeFormat;
-import sun.rmi.runtime.Log;
 
 /**
  * 网格工作日志表 实体类
@@ -75,17 +74,17 @@
 	 */
 	@ApiModelProperty(value = "被访人用户id")
 	private Long householdId;
-
-	/**
-	 * 被访人姓名
-	 */
-	@ApiModelProperty(value = "被访人姓名")
-	private String name;
-	/**
-	 * 被访人电话
-	 */
-	@ApiModelProperty(value = "被访人电话")
-	private String phone;
+//
+//	/**
+//	 * 被访人姓名
+//	 */
+//	@ApiModelProperty(value = "被访人姓名")
+//	private String name;
+//	/**
+//	 * 被访人电话
+//	 */
+//	@ApiModelProperty(value = "被访人电话")
+//	private String phone;
 	/**
 	 * 内容
 	 */

--
Gitblit v1.9.3