Merge remote-tracking branch 'origin/master'

无关风月

3 天以前 0d1a73f4c0d35951dc42f0e35526d69c0e922afc

 ruoyi-system/src/main/java/com/ruoyi/system/model/DrDisplacement.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;
@@ -20,11 +21,12 @@
 * 拆迁情况
 * </p>
 *
 * @author WuGuanFengYue
 * @author mitao
 * @since 2025-10-17
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("dr_displacement")
@ApiModel(value="DrDisplacement对象", description="拆迁情况")
public class DrDisplacement implements Serializable {
@@ -36,107 +38,80 @@
    private Integer id;

    @ApiModelProperty(value = "姓名")
    @TableField("name")
    private String name;

    @ApiModelProperty(value = "联系电话")
    @TableField("phone")
    private String phone;

    @ApiModelProperty(value = "村社ID")
    @TableField("community_id")
    private Integer communityId;

    @ApiModelProperty(value = "村社名称")
    @TableField("community_name")
    private String communityName;

    @ApiModelProperty(value = "身份证")
    @TableField("id_card")
    private String idCard;

    @ApiModelProperty(value = "坐落地点")
    @TableField("address")
    private String address;

    @ApiModelProperty(value = "房屋总面积（㎡）")
    @TableField("total_area")
    private Double totalArea;

    @ApiModelProperty(value = "是否安置")
    @TableField("is_settlement")
    private Integer isSettlement;
    private Integer settlement;

    @ApiModelProperty(value = "房屋用途 0：住宅；1：商业")
    @TableField("house_type")
    private Integer houseType;

    @ApiModelProperty(value = "拆迁安置方式 0：产权调换；1：限量还房；2：货币安置；")
    @TableField("resettlement_mode")
    private Integer resettlementMode;

    @ApiModelProperty(value = "房屋补偿金额")
    @TableField("house_compensation")
    private BigDecimal houseCompensation;

    @ApiModelProperty(value = "附属设施补偿金额  ")
    @TableField("facility_compensation")
    private BigDecimal facilityCompensation;

    @ApiModelProperty(value = "其他金额")
    @TableField("other_compensation")
    private BigDecimal otherCompensation;

    @ApiModelProperty(value = "过渡费")
    @TableField("transition_allowance")
    private BigDecimal transitionAllowance;

    @ApiModelProperty(value = "搬家费")
    @TableField("moving_fee")
    private BigDecimal movingFee;

    @ApiModelProperty(value = "补偿合计")
    @TableField("total_compensation")
    private BigDecimal totalCompensation;

    @ApiModelProperty(value = "协议签订时间")
    @TableField("agreement_date")
    private LocalDate agreementDate;

    @ApiModelProperty(value = "安置小区")
    @TableField("settlement_community")
    private byte[] settlementCommunity;
    private String settlementCommunity;

    @ApiModelProperty(value = "人数")
    @TableField("person_count")
    private Integer personCount;

    @ApiModelProperty(value = "附件，多个使用英文逗号拼接")
    @TableField("attachment_urls")
    private String attachmentUrls;

    @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;