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 |   80 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 73 insertions(+), 7 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 db05842..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,13 +16,17 @@
  */
 package org.springblade.modules.property.entity;
 
-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;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
 import java.util.Date;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 物业派驻小区表 实体类
@@ -33,8 +37,16 @@
 @Data
 @TableName("jczz_property_company_district")
 @ApiModel(value = "PropertyCompanyDistrict对象", description = "物业派驻小区表")
-@EqualsAndHashCode(callSuper = true)
-public class PropertyCompanyDistrictEntity extends TenantEntity {
+public class PropertyCompanyDistrictEntity implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 主键
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	@ApiModelProperty("主键id")
+	@TableId(value = "id", type = IdType.AUTO)
+	private Integer id;
 
 	/**
 	 * 物业公司id
@@ -47,9 +59,9 @@
 	@ApiModelProperty(value = "小区id")
 	private String districtId;
 	/**
-	 * 负责人姓名
+	 * 负责人id
 	 */
-	@ApiModelProperty(value = "负责人姓名")
+	@ApiModelProperty(value = "负责人id")
 	private String principal;
 	/**
 	 * 负责人电话
@@ -80,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;
 	/**
 	 * 简介
@@ -92,4 +108,54 @@
 	@ApiModelProperty(value = "简介")
 	private String remark;
 
+	/**
+	 * 用户id
+	 */
+	@ApiModelProperty(value = "用户id")
+	private String userId;
+
+	/**
+	 * 创建人
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	@ApiModelProperty("创建人")
+	@TableField(fill = FieldFill.INSERT)
+	private String createUser;
+
+	/**
+	 * 创建时间
+	 */
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty("创建时间")
+	@TableField(fill = FieldFill.INSERT)
+	private Date createTime;
+
+	/**
+	 * 更新人
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	@ApiModelProperty("更新人")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	private String updateUser;
+
+	/**
+	 * 更新时间
+	 */
+	@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;
+
+	/**
+	 * 是否删除
+	 */
+	@TableLogic
+	@ApiModelProperty("是否已删除 0:否  1:是")
+	private Integer isDeleted;
+
+	@ApiModelProperty("电子合同")
+	private String electronicContract;
+
 }

--
Gitblit v1.9.3