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/DrResettlement.java | 28 +++++-----------------------
1 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/DrResettlement.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/DrResettlement.java
index 52be0ed..7b5df09 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/DrResettlement.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/DrResettlement.java
@@ -1,14 +1,14 @@
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.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
import java.io.Serializable;
import java.time.LocalDateTime;
@@ -18,11 +18,12 @@
* 安置办证表
* </p>
*
- * @author WuGuanFengYue
+ * @author mitao
* @since 2025-10-17
*/
@Data
@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
@TableName("dr_resettlement")
@ApiModel(value="DrResettlement对象", description="安置办证表")
public class DrResettlement implements Serializable {
@@ -34,71 +35,52 @@
private Integer id;
@ApiModelProperty(value = "拆迁情况ID")
- @TableField("displacement_id")
private Integer displacementId;
@ApiModelProperty(value = "小区ID")
- @TableField("community_id")
private Integer communityId;
@ApiModelProperty(value = "拆迁协议")
- @TableField("displacement_agreement_url")
private String displacementAgreementUrl;
@ApiModelProperty(value = "结算清单")
- @TableField("settlement_list_url")
private String settlementListUrl;
@ApiModelProperty(value = "缴费收据")
- @TableField("payment_receipt_url")
private String paymentReceiptUrl;
@ApiModelProperty(value = "身份证")
- @TableField("id_card_url")
private String idCardUrl;
@ApiModelProperty(value = "结婚证")
- @TableField("marriage_certificate_url")
private String marriageCertificateUrl;
@ApiModelProperty(value = "户口本复印件")
- @TableField("household_register_url")
private String householdRegisterUrl;
@ApiModelProperty(value = "旧房产证")
- @TableField("old_property_certificate_url")
private String oldPropertyCertificateUrl;
@ApiModelProperty(value = "土地证")
- @TableField("land_certificate_url")
private String landCertificateUrl;
@ApiModelProperty(value = "其他")
- @TableField("other_documents_url")
private String otherDocumentsUrl;
@ApiModelProperty(value = "创建时间")
- @TableField("create_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-
private LocalDateTime createTime;
@ApiModelProperty(value = "创建人")
- @TableField("create_by")
private String createBy;
@ApiModelProperty(value = "更新时间")
- @TableField("update_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-
private LocalDateTime updateTime;
@ApiModelProperty(value = "更新人")
- @TableField("update_by")
private String updateBy;
@ApiModelProperty(value = "是否删除 0-否，1-是")
- @TableField("disabled")
+ @TableLogic
private Boolean disabled;
--
Gitblit v1.7.1