From c9827831122d160552cbfa2771e39fd805f99502 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 24 Nov 2023 16:51:00 +0800
Subject: [PATCH] 区域树查询修改,物业公司,小区关联修改,小区树查询新增

---
 src/main/java/org/springblade/modules/property/entity/PropertyCompanyEntity.java |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/springblade/modules/property/entity/PropertyCompanyEntity.java b/src/main/java/org/springblade/modules/property/entity/PropertyCompanyEntity.java
index 516839c..e9a12a2 100644
--- a/src/main/java/org/springblade/modules/property/entity/PropertyCompanyEntity.java
+++ b/src/main/java/org/springblade/modules/property/entity/PropertyCompanyEntity.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;
@@ -72,17 +69,17 @@
 	 * 省编号
 	 */
 	@ApiModelProperty(value = "省编号")
-	private String provinceCode;
+	private String province;
 	/**
 	 * 市编号
 	 */
 	@ApiModelProperty(value = "市编号")
-	private String cityCode;
+	private String city;
 	/**
 	 * 区县编号
 	 */
 	@ApiModelProperty(value = "区县编号")
-	private String countyCode;
+	private String area;
 	/**
 	 * 简介
 	 */
@@ -94,6 +91,7 @@
 	 */
 	@JsonSerialize(using = ToStringSerializer.class)
 	@ApiModelProperty("创建人")
+	@TableField(fill = FieldFill.INSERT)
 	private String createUser;
 
 	/**
@@ -102,6 +100,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;
 
 	/**
@@ -109,6 +108,7 @@
 	 */
 	@JsonSerialize(using = ToStringSerializer.class)
 	@ApiModelProperty("更新人")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private String updateUser;
 
 	/**
@@ -117,6 +117,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;
 
 	/**

--
Gitblit v1.9.3