From d0e27ecff97fff5fabed2696c9813c8e17ac6322 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 23 Nov 2023 17:54:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/property/entity/PropertyDistrictUserEntity.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/property/entity/PropertyDistrictUserEntity.java b/src/main/java/org/springblade/modules/property/entity/PropertyDistrictUserEntity.java
index 01752ac..7a2bdf0 100644
--- a/src/main/java/org/springblade/modules/property/entity/PropertyDistrictUserEntity.java
+++ b/src/main/java/org/springblade/modules/property/entity/PropertyDistrictUserEntity.java
@@ -16,12 +16,18 @@
*/
package org.springblade.modules.property.entity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+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 lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.io.Serializable;
/**
* 物业公司人员派驻小区关联表 实体类
@@ -32,8 +38,16 @@
@Data
@TableName("jczz_property_district_user")
@ApiModel(value = "PropertyDistrictUser对象", description = "物业公司人员派驻小区关联表")
-@EqualsAndHashCode(callSuper = true)
-public class PropertyDistrictUserEntity extends TenantEntity {
+public class PropertyDistrictUserEntity implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ /**
+ * 主键
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty("主键id")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
/**
* 物业公司id
--
Gitblit v1.9.3