From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送

---
 src/main/java/org/springblade/modules/property/entity/PropertyCompanyDistrictEntity.java |   28 ++++++++++++++++++++--------
 1 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/springblade/modules/property/entity/PropertyCompanyDistrictEntity.java b/src/main/java/org/springblade/modules/property/entity/PropertyCompanyDistrictEntity.java
index d93ffa2..4d7c71e 100644
--- a/src/main/java/org/springblade/modules/property/entity/PropertyCompanyDistrictEntity.java
+++ b/src/main/java/org/springblade/modules/property/entity/PropertyCompanyDistrictEntity.java
@@ -16,10 +16,7 @@
  */
 package org.springblade.modules.property.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -29,8 +26,6 @@
 
 import java.io.Serializable;
 import java.util.Date;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
 import org.springframework.format.annotation.DateTimeFormat;
 
 /**
@@ -64,9 +59,9 @@
 	@ApiModelProperty(value = "小区id")
 	private String districtId;
 	/**
-	 * 负责人姓名
+	 * 负责人id
 	 */
-	@ApiModelProperty(value = "负责人姓名")
+	@ApiModelProperty(value = "负责人id")
 	private String principal;
 	/**
 	 * 负责人电话
@@ -97,11 +92,15 @@
 	 * 合同开始时间
 	 */
 	@ApiModelProperty(value = "合同开始时间")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date startTime;
 	/**
 	 * 合同结束时间
 	 */
 	@ApiModelProperty(value = "合同结束时间")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date endTime;
 	/**
 	 * 简介
@@ -110,10 +109,17 @@
 	private String remark;
 
 	/**
+	 * 用户id
+	 */
+	@ApiModelProperty(value = "用户id")
+	private String userId;
+
+	/**
 	 * 创建人
 	 */
 	@JsonSerialize(using = ToStringSerializer.class)
 	@ApiModelProperty("创建人")
+	@TableField(fill = FieldFill.INSERT)
 	private String createUser;
 
 	/**
@@ -122,6 +128,7 @@
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty("创建时间")
+	@TableField(fill = FieldFill.INSERT)
 	private Date createTime;
 
 	/**
@@ -129,6 +136,7 @@
 	 */
 	@JsonSerialize(using = ToStringSerializer.class)
 	@ApiModelProperty("更新人")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private String updateUser;
 
 	/**
@@ -137,6 +145,7 @@
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty("更新时间")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private Date updateTime;
 
 	/**
@@ -146,4 +155,7 @@
 	@ApiModelProperty("是否已删除 0:否  1:是")
 	private Integer isDeleted;
 
+	@ApiModelProperty("电子合同")
+	private String electronicContract;
+
 }

--
Gitblit v1.9.3