From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/property/entity/PropertyCompanyEntity.java | 22 +++++++++++++++-------
1 files changed, 15 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..5abce9b 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;
@@ -54,6 +51,13 @@
private Integer id;
/**
+ * 组织机构id
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty(value = "组织机构id")
+ private Long deptId;
+
+ /**
* 物业公司名称
*/
@ApiModelProperty(value = "物业公司名称")
@@ -72,17 +76,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 +98,7 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty("创建人")
+ @TableField(fill = FieldFill.INSERT)
private String createUser;
/**
@@ -102,6 +107,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 +115,7 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty("更新人")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String updateUser;
/**
@@ -117,6 +124,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