From 0d1a73f4c0d35951dc42f0e35526d69c0e922afc Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 17 十月 2025 15:00:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/DrDisplacementHouse.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/DrDisplacementHouse.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/DrDisplacementHouse.java
index 15993c8..9b0bee7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/DrDisplacementHouse.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/DrDisplacementHouse.java
@@ -1,26 +1,26 @@
package com.ruoyi.system.model;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
+import lombok.experimental.Accessors;
/**
* <p>
* 拆迁情况房屋面积明细
* </p>
*
- * @author WuGuanFengYue
+ * @author mitao
* @since 2025-10-17
*/
@Data
@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
@TableName("dr_displacement_house")
@ApiModel(value="DrDisplacementHouse对象", description="拆迁情况房屋面积明细")
public class DrDisplacementHouse implements Serializable {
@@ -32,15 +32,12 @@
private Integer id;
@ApiModelProperty(value = "拆迁ID")
- @TableField("displacement_id")
private Integer displacementId;
@ApiModelProperty(value = "结构 0：砖混；1：砖木；2：瓦木；3：垮塌；4：预制现浇；5：其他；")
- @TableField("construction_type")
private Integer constructionType;
@ApiModelProperty(value = "面积（㎡）")
- @TableField("area")
private Double area;
--
Gitblit v1.7.1