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/LandReserved.java | 42 ++++++++----------------------------------
1 files changed, 8 insertions(+), 34 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/LandReserved.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/LandReserved.java
index ecc4dfd..2643395 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/LandReserved.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/LandReserved.java
@@ -3,12 +3,13 @@
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.math.BigDecimal;
@@ -19,11 +20,12 @@
* 收储土地
* </p>
*
- * @author WuGuanFengYue
+ * @author mitao
* @since 2025-10-17
*/
@Data
@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
@TableName("land_reserved")
@ApiModel(value="LandReserved对象", description="收储土地")
public class LandReserved implements Serializable {
@@ -35,103 +37,75 @@
private Integer id;
@ApiModelProperty(value = "地块名称")
- @TableField("land_name")
private String landName;
@ApiModelProperty(value = "辖区名称")
- @TableField("street_name")
private String streetName;
@ApiModelProperty(value = "镇街ID")
- @TableField("street_id")
private Integer streetId;
@ApiModelProperty(value = "详细地址")
- @TableField("address")
private String address;
@ApiModelProperty(value = "性质 0：商业用地；1：综合用地；2：住宅用地；3：工业用地；4：其他用地；")
- @TableField("type")
private Integer type;
@ApiModelProperty(value = "面积（㎡）")
- @TableField("area")
private Double area;
@ApiModelProperty(value = "是否注销")
@TableField("is_write_off")
- private Boolean isWriteOff;
+ private Boolean writeOff;
@ApiModelProperty(value = "原权属人")
- @TableField("orignal_owner")
- private String orignalOwner;
+ private String originalOwner;
@ApiModelProperty(value = "现管理单位")
- @TableField("current_institution")
private String currentInstitution;
@ApiModelProperty(value = "备注说明")
- @TableField("remark")
private String remark;
@ApiModelProperty(value = "拆迁情况")
- @TableField("demolition_situation")
private String demolitionSituation;
@ApiModelProperty(value = "收储金额")
- @TableField("reserved_money_amount")
private BigDecimal reservedMoneyAmount;
@ApiModelProperty(value = "收储时间")
- @TableField("reserved_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-
private LocalDateTime reservedTime;
@ApiModelProperty(value = "支付情况")
- @TableField("payment_situation")
private String paymentSituation;
@ApiModelProperty(value = "抵押银行")
- @TableField("mortgage_bank")
private String mortgageBank;
@ApiModelProperty(value = "抵押时间")
- @TableField("mortgage_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-
private LocalDateTime mortgageTime;
@ApiModelProperty(value = "抵押金额")
- @TableField("mortgage_amount")
private BigDecimal mortgageAmount;
@ApiModelProperty(value = "是否出让")
@TableField("is_sell")
- private Boolean isSell;
+ private Boolean sell;
@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