From c3a11538b96aeac198fbaa467210ef8754773ad1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 24 十月 2025 18:14:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/DrDisplacement.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/DrDisplacement.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/DrDisplacement.java
index f00c3a4..a8b7add 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/DrDisplacement.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/DrDisplacement.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.model;
+import cn.afterturn.easypoi.excel.annotation.Excel;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -38,24 +39,31 @@
private Integer id;
@ApiModelProperty(value = "姓名")
+ @Excel(name = "姓名", width = 20,orderNum = "1")
private String name;
@ApiModelProperty(value = "联系电话")
+ @Excel(name = "电话", width = 20,orderNum = "2")
+
private String phone;
@ApiModelProperty(value = "村社ID")
private Integer communityId;
@ApiModelProperty(value = "村社名称")
+ @Excel(name = "村社", width = 40,orderNum = "3")
+
private String communityName;
@ApiModelProperty(value = "身份证")
+ @Excel(name = "村社", width = 40,orderNum = "4")
private String idCard;
@ApiModelProperty(value = "坐落地点")
+ @Excel(name = "房屋总面积", width = 40,orderNum = "7")
private String address;
-
@ApiModelProperty(value = "房屋总面积（㎡）")
+ @Excel(name = "房屋总面积", width = 40,orderNum = "5")
private Double totalArea;
@ApiModelProperty(value = "是否安置")
@@ -113,6 +121,8 @@
@ApiModelProperty(value = "是否删除 0-否，1-是")
@TableLogic
private Boolean disabled;
-
+ @ApiModelProperty(value = "结构")
+ @TableField(exist = false)
+ private String constructionTypes;
}
--
Gitblit v1.7.1