修改实体

xuhy

2025-01-20 903202422467a2f2d5dc7f7b01fc77339cd8944a

修改实体

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseModel.java

@@ -1,48 +1,109 @@
package com.ruoyi.common.core.domain;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.data.annotation.CreatedBy;

import java.io.Serializable;
import java.util.Date;
import java.time.LocalDateTime;

/**
 * Entity基类
 *
 * @author ruoyi
 * @author xiaochen
 * @ClassName BaseModel
 * @Description
 * @date 2024-04-02 19:38
 */
@Data
public class BaseModel implements Serializable
{
    private static final long serialVersionUID = 1L;
public class BaseModel implements Serializable {
    /**
     * 字段常量属性
     */
    public static final String ID = "id";

    /** 创建者 */
    public static final String CREATE_TIME = "create_time";

    public static final String LAST_TIME = "last_time";

    private static final long serialVersionUID = 2553749188490103197L;
    /**
     * 新增执行
     */
    @ApiModelProperty(value = "记录创建人，前端忽略")
    @CreatedBy
    @JsonIgnore
    @TableField(value = "create_by", fill = FieldFill.INSERT)
    private String createBy;

    /** 创建时间 */
    @ApiModelProperty(value = "记录创建时间，前端忽略")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    /** 更新者 */

    /**
     * 新增和更新执行
     */
    @ApiModelProperty(value = "记录修改人，前端忽略")
    @JsonIgnore
    @TableField(value = "update_by", fill = FieldFill.INSERT_UPDATE)
    private String updateBy;

    /** 更新时间 */
    @ApiModelProperty(value = "记录修改时间，前端忽略")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date updateTime;

    /** 是否删除 0未删除 1已删除 */
    @ApiModelProperty(value = "是否删除 0未删除 1已删除")
    /**
     * 删除  未删除
     */
    @JsonIgnore
    @TableField("`disabled`")
    @TableLogic
    private Integer isDelete;
    private Boolean disabled;

    @ApiModelProperty(value = "记录创建时间，前端忽略")
    @TableField("create_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime createTime;

    /**
     * 最后修改时间
     */
    @ApiModelProperty(value = "记录修改时间，前端忽略")
    @JsonIgnore
    @TableField("last_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime lastTime;


    public String getCreateBy() {
        return createBy;
    }

    public void setCreateBy(String createBy) {
        this.createBy = createBy;
    }

    public String getUpdateBy() {
        return updateBy;
    }

    public void setUpdateBy(String updateBy) {
        this.updateBy = updateBy;
    }

    public Boolean getDisabled() {
        return disabled;
    }

    public void setDisabled(Boolean disabled) {
        this.disabled = disabled;
    }

    public LocalDateTime getCreateTime() {
        return createTime;
    }

    public void setCreateTime(LocalDateTime createTime) {
        this.createTime = createTime;
    }

    public LocalDateTime getLastTime() {
        return lastTime;
    }

    public void setLastTime(LocalDateTime lastTime) {
        this.lastTime = lastTime;
    }
}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBillMapper.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.mapper;

import com.ruoyi.system.model.TBill;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TCheckAcceptRecordMapper.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.mapper;

import com.ruoyi.system.model.TCheckAcceptRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TContractMapper.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.mapper;

import com.ruoyi.system.model.TContract;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TContractRentTypeMapper.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.mapper;

import com.ruoyi.system.model.TContractRentType;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TFaultAreaDicMapper.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.mapper;

import com.ruoyi.system.model.TFaultAreaDic;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TFaultDescribeDicMapper.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.mapper;

import com.ruoyi.system.model.TFaultDescribeDic;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TFaultRepairMessageMapper.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.mapper;

import com.ruoyi.system.model.TFaultRepairMessage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TFlowManagementMapper.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.mapper;

import com.ruoyi.system.model.TFlowManagement;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/THouseMapper.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.mapper;

import com.ruoyi.system.model.THouse;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TInformationMapper.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.mapper;

import com.ruoyi.system.model.TInformation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TInvoiceMapper.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.mapper;

import com.ruoyi.system.model.TInvoice;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TItemMapper.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.mapper;

import com.ruoyi.system.model.TItem;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TItemTypeMapper.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.mapper;

import com.ruoyi.system.model.TItemType;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSysConfigMapper.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.mapper;

import com.ruoyi.system.model.TSysConfig;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTenantMapper.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.mapper;

import com.ruoyi.system.model.TTenant;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java

@@ -1,11 +1,17 @@
package com.ruoyi.system.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseModel;
import com.ruoyi.common.core.domain.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,99 +23,82 @@
 * </p>
 *
 * @author xiaochen
 * @since 2025-01-17
 * @since 2025-01-20
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_bill")
@ApiModel(value="TBill对象", description="租金账单")
public class TBill implements Serializable {
public class TBill extends BaseModel {

    private static final long serialVersionUID = 1L;

    @TableId("id")
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @ApiModelProperty(value = "合同id")
    @TableField("contractId")
    @TableField("contract_id")
    private String contractId;

    @ApiModelProperty(value = "应缴费")
    @TableField("payableFeesMoney")
    @TableField("payable_fees_money")
    private Double payableFeesMoney;

    @ApiModelProperty(value = "应缴费日期")
    @TableField("payableFeesTime")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("payable_fees_time")
    private LocalDateTime payableFeesTime;

    @ApiModelProperty(value = "缴费状态 1=未缴费 2=待确认 3=已缴费 4=已逾期")
    @TableField("payFeesStatus")
    @TableField("pay_fees_status")
    private Integer payFeesStatus;

    @ApiModelProperty(value = "缴费金额")
    @TableField("payFeesMoney")
    private Double payFeesMoney;
    @TableField("pay_fees_money")
    private BigDecimal payFeesMoney;

    @ApiModelProperty(value = "缴费日期")
    @TableField("payFeesTime")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("pay_fees_time")
    private LocalDateTime payFeesTime;

    @ApiModelProperty(value = "缴费方式 1=线上缴费 =2线下缴费")
    @TableField("payFeesType")
    @TableField("pay_fees_type")
    private Integer payFeesType;

    @ApiModelProperty(value = "账单类型 1=租金 2=押金 3=生活费用")
    @TableField("billType")
    @TableField("bill_type")
    private Integer billType;

    @ApiModelProperty(value = "逾期天数")
    @TableField("overDays")
    @TableField("over_days")
    private Integer overDays;

    @ApiModelProperty(value = "应缴违约金")
    @TableField("payableFeesPenalty")
    private Double payableFeesPenalty;
    @TableField("payable_fees_penalty")
    private BigDecimal payableFeesPenalty;

    @ApiModelProperty(value = "账单周期开始时间")
    @TableField("startTime")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("start_time")
    private LocalDateTime startTime;

    @ApiModelProperty(value = "账单周期结束时间")
    @TableField("endTime")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("end_time")
    private LocalDateTime endTime;

    @ApiModelProperty(value = "银行流水号")
    @TableField("bankSerialNumber")
    @TableField("bank_serial_number")
    private String bankSerialNumber;

    @ApiModelProperty(value = "实际收款")
    @TableField("actualMoney")
    private Double actualMoney;
    @TableField("actual_money")
    private BigDecimal actualMoney;

    @ApiModelProperty(value = "凭证上传")
    @TableField("voucher")
    private String voucher;

    @ApiModelProperty(value = "创建时间")
    @TableField("createTime")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "修改时间")
    @TableField("updateTime")
    private LocalDateTime updateTime;

    @ApiModelProperty(value = "创建人")
    @TableField("createBy")
    private String createBy;

    @ApiModelProperty(value = "修改人")
    @TableField("updateBy")
    private String updateBy;

    @ApiModelProperty(value = "是否删除 0=否 1=是")
    @TableField("isDelete")
    @TableLogic
    private Integer isDelete;


}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TCheckAcceptRecord.java

@@ -1,11 +1,16 @@
package com.ruoyi.system.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,61 +22,62 @@
 * </p>
 *
 * @author xiaochen
 * @since 2025-01-17
 * @since 2025-01-20
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_check_accept_record")
@ApiModel(value="TCheckAcceptRecord对象", description="验收记录")
public class TCheckAcceptRecord implements Serializable {
public class TCheckAcceptRecord extends BaseModel {

    private static final long serialVersionUID = 1L;

    @TableId("id")
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @ApiModelProperty(value = "合同id")
    @TableField("contractId")
    @TableField("contract_id")
    private String contractId;

    @ApiModelProperty(value = "房屋id")
    @TableField("houseId")
    @TableField("house_id")
    private String houseId;

    @ApiModelProperty(value = "验收时间")
    @TableField("checkTime")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("check_time")
    private LocalDateTime checkTime;

    @ApiModelProperty(value = "退租原因")
    @TableField("leaseReason")
    @TableField("lease_reason")
    private String leaseReason;

    @ApiModelProperty(value = "验收人员")
    @TableField("checkPerson")
    @TableField("check_person")
    private String checkPerson;

    @ApiModelProperty(value = "陪同人员")
    @TableField("accompanyPerson")
    @TableField("accompany_person")
    private String accompanyPerson;

    @ApiModelProperty(value = "整体情况")
    @TableField("overallSituation")
    @TableField("overall_situation")
    private String overallSituation;

    @ApiModelProperty(value = "家电家具情况")
    @TableField("furnitureSituation")
    @TableField("furniture_situation")
    private String furnitureSituation;

    @ApiModelProperty(value = "设施设备情况")
    @TableField("deviceSituation")
    @TableField("device_situation")
    private String deviceSituation;

    @ApiModelProperty(value = "清洁情况")
    @TableField("cleanSituation")
    @TableField("clean_situation")
    private String cleanSituation;

    @ApiModelProperty(value = "其他问题")
    @TableField("otherProblem")
    @TableField("other_problem")
    private String otherProblem;

    @ApiModelProperty(value = "图片")
@@ -79,33 +85,11 @@
    private String pictures;

    @ApiModelProperty(value = "验收结果 1=合格 2=不合格")
    @TableField("checkResult")
    @TableField("check_result")
    private Integer checkResult;

    @ApiModelProperty(value = "验收结算金额")
    @TableField("checkMoney")
    private Double checkMoney;

    @ApiModelProperty(value = "创建时间")
    @TableField("createTime")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "修改时间")
    @TableField("updateTime")
    private LocalDateTime updateTime;

    @ApiModelProperty(value = "创建人")
    @TableField("createBy")
    private String createBy;

    @ApiModelProperty(value = "修改人")
    @TableField("updateBy")
    private String updateBy;

    @ApiModelProperty(value = "是否删除 0=否 1=是")
    @TableField("isDelete")
    @TableLogic
    private Integer isDelete;

    @TableField("check_money")
    private BigDecimal checkMoney;

}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java

@@ -1,11 +1,16 @@
package com.ruoyi.system.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,49 +22,52 @@
 * </p>
 *
 * @author xiaochen
 * @since 2025-01-17
 * @since 2025-01-20
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_contract")
@ApiModel(value="TContract对象", description="合同管理")
public class TContract implements Serializable {
public class TContract extends BaseModel {

    private static final long serialVersionUID = 1L;

    @TableId("id")
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @ApiModelProperty(value = "合同编号")
    @TableField("contractNumber")
    @TableField("contract_number")
    private String contractNumber;

    @ApiModelProperty(value = "合同名称")
    @TableField("contractName")
    @TableField("contract_name")
    private String contractName;

    @ApiModelProperty(value = "开始时间")
    @TableField("startTime")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("start_time")
    private LocalDateTime startTime;

    @ApiModelProperty(value = "结束时间")
    @TableField("endTime")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("end_time")
    private LocalDateTime endTime;

    @ApiModelProperty(value = "合计租金")
    @TableField("totalRent")
    private Double totalRent;
    @TableField("total_rent")
    private BigDecimal totalRent;

    @ApiModelProperty(value = "押金")
    @TableField("deposit")
    private Double deposit;
    private BigDecimal deposit;

    @ApiModelProperty(value = "租金支付方式 1=季付")
    @TableField("payType")
    @TableField("pay_type")
    private Integer payType;

    @ApiModelProperty(value = "第一次支付日期")
    @TableField("firstPayTime")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("first_pay_time")
    private LocalDateTime firstPayTime;

    @ApiModelProperty(value = "是否递增递减 1=是 0=否")
@@ -67,47 +75,47 @@
    private Integer isIncreasing;

    @ApiModelProperty(value = "押金是否随租金递增递减 1=是 0=否")
    @TableField("isIncreasingDeposit")
    private Integer isIncreasingDeposit;
    @TableField("isIncreasing_deposit")
    private Integer isincreasingDeposit;

    @ApiModelProperty(value = "违约金比例")
    @TableField("proportion")
    private Double proportion;
    private BigDecimal proportion;

    @ApiModelProperty(value = "房屋id")
    @TableField("houseId")
    @TableField("house_id")
    private String houseId;

    @ApiModelProperty(value = "甲方名称")
    @TableField("partyOneName")
    @TableField("party_one_name")
    private String partyOneName;

    @ApiModelProperty(value = "甲方联系人")
    @TableField("partyOnePerson")
    @TableField("party_one_person")
    private String partyOnePerson;

    @ApiModelProperty(value = "甲方联系方式")
    @TableField("partyOnePhone")
    @TableField("party_one_phone")
    private String partyOnePhone;

    @ApiModelProperty(value = "租户id")
    @TableField("tenantId")
    @TableField("tenant_id")
    private String tenantId;

    @ApiModelProperty(value = "乙方名称")
    @TableField("partyTwoName")
    @TableField("party_two_name")
    private String partyTwoName;

    @ApiModelProperty(value = "乙方联系人")
    @TableField("partyTwoPerson")
    @TableField("party_two_person")
    private String partyTwoPerson;

    @ApiModelProperty(value = "乙方联系方式")
    @TableField("partyTwoPhone")
    @TableField("party_two_phone")
    private String partyTwoPhone;

    @ApiModelProperty(value = "合同附件")
    @TableField("contractFile")
    @TableField("contract_file")
    private String contractFile;

    @ApiModelProperty(value = "备注")
@@ -117,27 +125,5 @@
    @ApiModelProperty(value = "状态 1=待审批 2=未签订 3=已签订")
    @TableField("status")
    private Integer status;

    @ApiModelProperty(value = "创建时间")
    @TableField("createTime")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "修改时间")
    @TableField("updateTime")
    private LocalDateTime updateTime;

    @ApiModelProperty(value = "创建人")
    @TableField("createBy")
    private String createBy;

    @ApiModelProperty(value = "修改人")
    @TableField("updateBy")
    private String updateBy;

    @ApiModelProperty(value = "是否删除 0=否 1=是")
    @TableField("isDelete")
    @TableLogic
    private Integer isDelete;


}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TContractRentType.java

@@ -1,9 +1,12 @@
package com.ruoyi.system.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import java.math.BigDecimal;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -15,7 +18,7 @@
 * </p>
 *
 * @author xiaochen
 * @since 2025-01-17
 * @since 2025-01-20
 */
@Data
@EqualsAndHashCode(callSuper = false)
@@ -25,24 +28,24 @@

    private static final long serialVersionUID = 1L;

    @TableId("id")
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @ApiModelProperty(value = "合同id")
    @TableField("contractId")
    @TableField("contract_id")
    private String contractId;

    @ApiModelProperty(value = "递增递减 1=递增 2=递减")
    @TableField("IncreasingDecreasing")
    private Integer IncreasingDecreasing;
    @TableField("Increasing_decreasing")
    private Integer increasingDecreasing;

    @ApiModelProperty(value = "递增递减形式 1=百分比 2=金额元")
    @TableField("IncreasingDecreasingType")
    private Integer IncreasingDecreasingType;
    @TableField("Increasing_decreasing_type")
    private Integer increasingDecreasingType;

    @ApiModelProperty(value = "数值")
    @TableField("numericalValue")
    private Double numericalValue;
    @TableField("numerical_value")
    private BigDecimal numericalValue;


}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultAreaDic.java

@@ -1,5 +1,6 @@
package com.ruoyi.system.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -15,7 +16,7 @@
 * </p>
 *
 * @author xiaochen
 * @since 2025-01-17
 * @since 2025-01-20
 */
@Data
@EqualsAndHashCode(callSuper = false)
@@ -25,11 +26,11 @@

    private static final long serialVersionUID = 1L;

    @TableId("id")
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @ApiModelProperty(value = "故障区域名称")
    @TableField("faultAreaName")
    @TableField("fault_area_name")
    private String faultAreaName;



 ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultDescribeDic.java

@@ -1,5 +1,6 @@
package com.ruoyi.system.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -15,7 +16,7 @@
 * </p>
 *
 * @author xiaochen
 * @since 2025-01-17
 * @since 2025-01-20
 */
@Data
@EqualsAndHashCode(callSuper = false)
@@ -25,15 +26,15 @@

    private static final long serialVersionUID = 1L;

    @TableId("id")
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @ApiModelProperty(value = "故障区域id")
    @TableField("faultId")
    @TableField("fault_id")
    private String faultId;

    @ApiModelProperty(value = "故障描述")
    @TableField("describeName")
    @TableField("describe_name")
    private String describeName;



 ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultRepairMessage.java

@@ -1,11 +1,14 @@
package com.ruoyi.system.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,77 +20,79 @@
 * </p>
 *
 * @author xiaochen
 * @since 2025-01-17
 * @since 2025-01-20
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_fault_repair_message")
@ApiModel(value="TFaultRepairMessage对象", description="报修管理")
public class TFaultRepairMessage implements Serializable {
public class TFaultRepairMessage extends BaseModel {

    private static final long serialVersionUID = 1L;

    @TableId("id")
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @ApiModelProperty(value = "用户id")
    @TableField("appUserId")
    @TableField("app_user_id")
    private String appUserId;

    @ApiModelProperty(value = "物品id")
    @TableField("itemId")
    @TableField("item_id")
    private String itemId;

    @ApiModelProperty(value = "故障区域")
    @TableField("faultAreaName")
    @TableField("fault_area_name")
    private String faultAreaName;

    @ApiModelProperty(value = "故障描述")
    @TableField("describeName")
    @TableField("describe_name")
    private String describeName;

    @ApiModelProperty(value = "描述详情")
    @TableField("describeDetail")
    @TableField("describe_detail")
    private String describeDetail;

    @ApiModelProperty(value = "故障图片")
    @TableField("faultPictures")
    @TableField("fault_pictures")
    private String faultPictures;

    @ApiModelProperty(value = "服务地址")
    @TableField("serviceAddress")
    @TableField("service_address")
    private String serviceAddress;

    @ApiModelProperty(value = "报修类型 1=常规维修 2=紧急抢修")
    @TableField("repairType")
    @TableField("repair_type")
    private Integer repairType;

    @ApiModelProperty(value = "上门时间")
    @TableField("visitTime")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("visit_time")
    private LocalDateTime visitTime;

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

    @ApiModelProperty(value = "留言")
    @TableField("leaveMessage")
    @TableField("leave_message")
    private String leaveMessage;

    @ApiModelProperty(value = "处理人")
    @TableField("handlePerson")
    @TableField("handle_person")
    private String handlePerson;

    @ApiModelProperty(value = "处理时间")
    @TableField("handleTime")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("handle_time")
    private LocalDateTime handleTime;

    @ApiModelProperty(value = "结果描述")
    @TableField("reaultDescribe")
    private String reaultDescribe;
    @TableField("result_describe")
    private String resultDescribe;

    @ApiModelProperty(value = "处理照片")
    @TableField("repairPicture")
    @TableField("repair_picture")
    private String repairPicture;

    @ApiModelProperty(value = "附件")
@@ -97,27 +102,5 @@
    @ApiModelProperty(value = "状态 1=待处理 2=已处理")
    @TableField("status")
    private Integer status;

    @ApiModelProperty(value = "创建时间")
    @TableField("createTime")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "修改时间")
    @TableField("updateTime")
    private LocalDateTime updateTime;

    @ApiModelProperty(value = "创建人")
    @TableField("createBy")
    private String createBy;

    @ApiModelProperty(value = "修改人")
    @TableField("updateBy")
    private String updateBy;

    @ApiModelProperty(value = "是否删除 0=否 1=是")
    @TableField("isDelete")
    @TableLogic
    private Integer isDelete;


}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TFlowManagement.java

@@ -1,11 +1,16 @@
package com.ruoyi.system.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,41 +22,42 @@
 * </p>
 *
 * @author xiaochen
 * @since 2025-01-17
 * @since 2025-01-20
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_flow_management")
@ApiModel(value="TFlowManagement对象", description="流水管理")
public class TFlowManagement implements Serializable {
public class TFlowManagement extends BaseModel {

    private static final long serialVersionUID = 1L;

    @TableId("id")
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @ApiModelProperty(value = "系统流水号")
    @TableField("sysSerialNumber")
    @TableField("sys_serial_number")
    private String sysSerialNumber;

    @ApiModelProperty(value = "银行流水号")
    @TableField("bankSerialNumber")
    @TableField("bank_serial_number")
    private String bankSerialNumber;

    @ApiModelProperty(value = "流水金额")
    @TableField("flowMoney")
    private Double flowMoney;
    @TableField("flow_money")
    private BigDecimal flowMoney;

    @ApiModelProperty(value = "抵扣金额")
    @TableField("deductionMoney")
    private Double deductionMoney;
    @TableField("deduction_money")
    private BigDecimal deductionMoney;

    @ApiModelProperty(value = "剩余金额")
    @TableField("remainingMoney")
    private Double remainingMoney;
    @TableField("remaining_money")
    private BigDecimal remainingMoney;

    @ApiModelProperty(value = "支付时间")
    @TableField("payTime")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("pay_time")
    private LocalDateTime payTime;

    @ApiModelProperty(value = "付款人")
@@ -59,41 +65,20 @@
    private String payer;

    @ApiModelProperty(value = "流水状态 1=正常 2=异常")
    @TableField("flowStatus")
    @TableField("flow_status")
    private Integer flowStatus;

    @ApiModelProperty(value = "流水类型 1=系统 2=银行")
    @TableField("flowType")
    @TableField("flow_type")
    private Integer flowType;

    @ApiModelProperty(value = "支付方式 1=微信支付 2=支付宝支付 3=线下支付")
    @TableField("payType")
    @TableField("pay_type")
    private Integer payType;

    @ApiModelProperty(value = "缴费账单id")
    @TableField("paymentBillId")
    @TableField("payment_bill_id")
    private String paymentBillId;

    @ApiModelProperty(value = "创建时间")
    @TableField("createTime")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "修改时间")
    @TableField("updateTime")
    private LocalDateTime updateTime;

    @ApiModelProperty(value = "创建人")
    @TableField("createBy")
    private String createBy;

    @ApiModelProperty(value = "修改人")
    @TableField("updateBy")
    private String updateBy;

    @ApiModelProperty(value = "是否删除 0=否 1=是")
    @TableField("isDelete")
    @TableLogic
    private Integer isDelete;


}

 ruoyi-system/src/main/java/com/ruoyi/system/model/THouse.java

@@ -1,11 +1,14 @@
package com.ruoyi.system.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,87 +20,66 @@
 * </p>
 *
 * @author xiaochen
 * @since 2025-01-17
 * @since 2025-01-20
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_house")
@ApiModel(value="THouse对象", description="房屋管理")
public class THouse implements Serializable {
public class THouse extends BaseModel {

    private static final long serialVersionUID = 1L;

    @TableId("id")
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @ApiModelProperty(value = "房屋图片")
    @TableField("housePicture")
    @TableField("house_picture")
    private String housePicture;

    @ApiModelProperty(value = "房屋名称")
    @TableField("houseName")
    @TableField("house_name")
    private String houseName;

    @ApiModelProperty(value = "地址")
    @TableField("houseAddress")
    @TableField("house_address")
    private String houseAddress;

    @ApiModelProperty(value = "建筑面积")
    @TableField("houseArea")
    @TableField("house_area")
    private Integer houseArea;

    @ApiModelProperty(value = "户型")
    @TableField("houseType")
    @TableField("house_type")
    private String houseType;

    @ApiModelProperty(value = "业务属性")
    @TableField("businessAttributes")
    @TableField("business_attributes")
    private String businessAttributes;

    @ApiModelProperty(value = "产品类型")
    @TableField("productType")
    @TableField("product_type")
    private String productType;

    @ApiModelProperty(value = "产权人")
    @TableField("propertyRightPerson")
    @TableField("property_right_person")
    private String propertyRightPerson;

    @ApiModelProperty(value = "产证编号")
    @TableField("propertyRightNumber")
    @TableField("property_right_number")
    private String propertyRightNumber;

    @ApiModelProperty(value = "产权开始日期")
    @TableField("propertyRightStartTime")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("property_right_start_time")
    private LocalDateTime propertyRightStartTime;

    @ApiModelProperty(value = "产权年限")
    @TableField("propertyRightDuration")
    @TableField("property_right_duration")
    private String propertyRightDuration;

    @ApiModelProperty(value = "租赁状态 1=待出租 2=已出租 3=维修中")
    @TableField("leaseStatus")
    @TableField("lease_status")
    private Integer leaseStatus;

    @ApiModelProperty(value = "创建时间")
    @TableField("createTime")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "修改时间")
    @TableField("updateTime")
    private LocalDateTime updateTime;

    @ApiModelProperty(value = "创建人")
    @TableField("createBy")
    private String createBy;

    @ApiModelProperty(value = "修改人")
    @TableField("updateBy")
    private String updateBy;

    @ApiModelProperty(value = "是否删除 0=否 1=是")
    @TableField("isDelete")
    @TableLogic
    private Integer isDelete;


}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TInformation.java

@@ -1,11 +1,14 @@
package com.ruoyi.system.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,33 +20,34 @@
 * </p>
 *
 * @author xiaochen
 * @since 2025-01-17
 * @since 2025-01-20
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_information")
@ApiModel(value="TInformation对象", description="资讯管理")
public class TInformation implements Serializable {
public class TInformation extends BaseModel {

    private static final long serialVersionUID = 1L;

    @TableId("id")
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @ApiModelProperty(value = "标题")
    @TableField("titleName")
    @TableField("title_name")
    private String titleName;

    @ApiModelProperty(value = "排序")
    @TableField("sortBy")
    @TableField("sort_by")
    private Integer sortBy;

    @ApiModelProperty(value = "信息来源")
    @TableField("infoSource")
    @TableField("info_source")
    private String infoSource;

    @ApiModelProperty(value = "发布时间")
    @TableField("releaseTime")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("release_time")
    private LocalDateTime releaseTime;

    @ApiModelProperty(value = "内容")
@@ -53,27 +57,6 @@
    @ApiModelProperty(value = "附件")
    @TableField("attachment")
    private String attachment;

    @ApiModelProperty(value = "创建时间")
    @TableField("createTime")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "修改时间")
    @TableField("updateTime")
    private LocalDateTime updateTime;

    @ApiModelProperty(value = "创建人")
    @TableField("createBy")
    private String createBy;

    @ApiModelProperty(value = "修改人")
    @TableField("updateBy")
    private String updateBy;

    @ApiModelProperty(value = "是否删除 0=否 1=是")
    @TableField("isDelete")
    @TableLogic
    private Integer isDelete;


}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TInvoice.java

@@ -1,11 +1,14 @@
package com.ruoyi.system.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,41 +20,41 @@
 * </p>
 *
 * @author xiaochen
 * @since 2025-01-17
 * @since 2025-01-20
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_invoice")
@ApiModel(value="TInvoice对象", description="开票管理")
public class TInvoice implements Serializable {
public class TInvoice extends BaseModel {

    private static final long serialVersionUID = 1L;

    @TableId("id")
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @ApiModelProperty(value = "申请编号")
    @TableField("invoiceNumber")
    @TableField("invoice_number")
    private String invoiceNumber;

    @ApiModelProperty(value = "金额")
    @TableField("invoiceMoney")
    @TableField("invoice_money")
    private Double invoiceMoney;

    @ApiModelProperty(value = "申请人")
    @TableField("applyName")
    @TableField("apply_name")
    private String applyName;

    @ApiModelProperty(value = "抬头类型 1=企业 2=个人")
    @TableField("titleType")
    @TableField("title_type")
    private Integer titleType;

    @ApiModelProperty(value = "抬头名称")
    @TableField("titleName")
    @TableField("title_name")
    private String titleName;

    @ApiModelProperty(value = "税号/身份证号")
    @TableField("serialNumber")
    @TableField("serial_number")
    private String serialNumber;

    @ApiModelProperty(value = "开票状态  1=待开票 2=已开票")
@@ -59,11 +62,12 @@
    private Integer status;

    @ApiModelProperty(value = "开票日期")
    @TableField("invoiceTime")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("invoice_time")
    private LocalDateTime invoiceTime;

    @ApiModelProperty(value = "开票凭证")
    @TableField("invoiceVoucher")
    @TableField("invoice_voucher")
    private String invoiceVoucher;

    @ApiModelProperty(value = "邮箱")
@@ -71,29 +75,8 @@
    private String email;

    @ApiModelProperty(value = "开票合同编号逗号分割")
    @TableField("contractNumber")
    @TableField("contract_number")
    private String contractNumber;

    @ApiModelProperty(value = "创建时间")
    @TableField("createTime")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "修改时间")
    @TableField("updateTime")
    private LocalDateTime updateTime;

    @ApiModelProperty(value = "创建人")
    @TableField("createBy")
    private String createBy;

    @ApiModelProperty(value = "修改人")
    @TableField("updateBy")
    private String updateBy;

    @ApiModelProperty(value = "是否删除 0=否 1=是")
    @TableField("isDelete")
    @TableLogic
    private Integer isDelete;


}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TItem.java

@@ -1,11 +1,13 @@
package com.ruoyi.system.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;

import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,55 +19,33 @@
 * </p>
 *
 * @author xiaochen
 * @since 2025-01-17
 * @since 2025-01-20
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_item")
@ApiModel(value="TItem对象", description="维修物品")
public class TItem implements Serializable {
public class TItem extends BaseModel {

    private static final long serialVersionUID = 1L;

    @TableId("id")
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @ApiModelProperty(value = "分类id")
    @TableField("typeId")
    @TableField("type_id")
    private String typeId;

    @ApiModelProperty(value = "物品名称")
    @TableField("itemName")
    @TableField("item_name")
    private String itemName;

    @ApiModelProperty(value = "权重")
    @TableField("sortBy")
    @TableField("sort_by")
    private Integer sortBy;

    @ApiModelProperty(value = "图片")
    @TableField("pictures")
    private String pictures;

    @ApiModelProperty(value = "创建时间")
    @TableField("createTime")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "修改时间")
    @TableField("updateTime")
    private LocalDateTime updateTime;

    @ApiModelProperty(value = "创建人")
    @TableField("createBy")
    private String createBy;

    @ApiModelProperty(value = "修改人")
    @TableField("updateBy")
    private String updateBy;

    @ApiModelProperty(value = "是否删除 0=否 1=是")
    @TableField("isDelete")
    @TableLogic
    private Integer isDelete;


}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TItemType.java

@@ -1,11 +1,13 @@
package com.ruoyi.system.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;

import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,47 +19,26 @@
 * </p>
 *
 * @author xiaochen
 * @since 2025-01-17
 * @since 2025-01-20
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_item_type")
@ApiModel(value="TItemType对象", description="维修物品分类")
public class TItemType implements Serializable {
public class TItemType extends BaseModel {

    private static final long serialVersionUID = 1L;

    @TableId("id")
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @ApiModelProperty(value = "分类名称")
    @TableField("typeName")
    @TableField("type_name")
    private String typeName;

    @ApiModelProperty(value = "权重")
    @TableField("sortBy")
    @TableField("sort_by")
    private Integer sortBy;

    @ApiModelProperty(value = "创建时间")
    @TableField("createTime")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "修改时间")
    @TableField("updateTime")
    private LocalDateTime updateTime;

    @ApiModelProperty(value = "创建人")
    @TableField("createBy")
    private String createBy;

    @ApiModelProperty(value = "修改人")
    @TableField("updateBy")
    private String updateBy;

    @ApiModelProperty(value = "是否删除 0=否 1=是")
    @TableField("isDelete")
    @TableLogic
    private Integer isDelete;


}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TSysConfig.java

@@ -1,5 +1,6 @@
package com.ruoyi.system.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -15,7 +16,7 @@
 * </p>
 *
 * @author xiaochen
 * @since 2025-01-17
 * @since 2025-01-20
 */
@Data
@EqualsAndHashCode(callSuper = false)
@@ -25,15 +26,15 @@

    private static final long serialVersionUID = 1L;

    @TableId("id")
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @ApiModelProperty(value = "系统名称")
    @TableField("systemName")
    @TableField("system_name")
    private String systemName;

    @ApiModelProperty(value = "公司名称")
    @TableField("companyName")
    @TableField("company_name")
    private String companyName;

    @ApiModelProperty(value = "联系方式")

 ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java

@@ -1,11 +1,14 @@
package com.ruoyi.system.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,45 +20,46 @@
 * </p>
 *
 * @author xiaochen
 * @since 2025-01-17
 * @since 2025-01-20
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_tenant")
@ApiModel(value="TTenant对象", description="租户")
public class TTenant implements Serializable {
public class TTenant extends BaseModel {

    private static final long serialVersionUID = 1L;

    @TableId("id")
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @ApiModelProperty(value = "住户名称")
    @TableField("residentName")
    @TableField("resident_name")
    private String residentName;

    @ApiModelProperty(value = "入住时间")
    @TableField("checkInTime")
    private LocalDateTime checkInTime;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("checkIn_time")
    private LocalDateTime checkinTime;

    @ApiModelProperty(value = "租户属性")
    @TableField("tenantAttributes")
    @TableField("tenant_attributes")
    private String tenantAttributes;

    @ApiModelProperty(value = "租户类型")
    @TableField("tenantType")
    @TableField("tenant_type")
    private Integer tenantType;

    @ApiModelProperty(value = "租户楼栋")
    @TableField("tenantBuilding")
    @TableField("tenant_building")
    private String tenantBuilding;

    @ApiModelProperty(value = "房号")
    @TableField("roomNumber")
    @TableField("room_number")
    private String roomNumber;

    @ApiModelProperty(value = "建筑面积")
    @TableField("buildingArea")
    @TableField("building_area")
    private Integer buildingArea;

    @ApiModelProperty(value = "联系电话")
@@ -63,7 +67,7 @@
    private String phone;

    @ApiModelProperty(value = "证件号码")
    @TableField("idCard")
    @TableField("id_card")
    private String idCard;

    @ApiModelProperty(value = "邮箱")
@@ -71,33 +75,11 @@
    private String email;

    @ApiModelProperty(value = "银行转账专号")
    @TableField("bankNumber")
    @TableField("bank_number")
    private String bankNumber;

    @ApiModelProperty(value = "通讯地址")
    @TableField("mailAddress")
    @TableField("mail_address")
    private String mailAddress;

    @ApiModelProperty(value = "创建时间")
    @TableField("createTime")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "修改时间")
    @TableField("updateTime")
    private LocalDateTime updateTime;

    @ApiModelProperty(value = "创建人")
    @TableField("createBy")
    private String createBy;

    @ApiModelProperty(value = "修改人")
    @TableField("updateBy")
    private String updateBy;

    @ApiModelProperty(value = "是否删除 0=否 1=是")
    @TableField("isDelete")
    @TableLogic
    private Integer isDelete;


}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service;

import com.ruoyi.system.model.TBill;
import com.baomidou.mybatisplus.extension.service.IService;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/service/TCheckAcceptRecordService.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service;

import com.ruoyi.system.model.TCheckAcceptRecord;
import com.baomidou.mybatisplus.extension.service.IService;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/service/TContractRentTypeService.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service;

import com.ruoyi.system.model.TContractRentType;
import com.baomidou.mybatisplus.extension.service.IService;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/service/TContractService.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service;

import com.ruoyi.system.model.TContract;
import com.baomidou.mybatisplus.extension.service.IService;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/service/TFaultAreaDicService.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service;

import com.ruoyi.system.model.TFaultAreaDic;
import com.baomidou.mybatisplus.extension.service.IService;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/service/TFaultDescribeDicService.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service;

import com.ruoyi.system.model.TFaultDescribeDic;
import com.baomidou.mybatisplus.extension.service.IService;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/service/TFaultRepairMessageService.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service;

import com.ruoyi.system.model.TFaultRepairMessage;
import com.baomidou.mybatisplus.extension.service.IService;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/service/TFlowManagementService.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service;

import com.ruoyi.system.model.TFlowManagement;
import com.baomidou.mybatisplus.extension.service.IService;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/service/THouseService.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service;

import com.ruoyi.system.model.THouse;
import com.baomidou.mybatisplus.extension.service.IService;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/service/TInformationService.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service;

import com.ruoyi.system.model.TInformation;
import com.baomidou.mybatisplus.extension.service.IService;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/service/TInvoiceService.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service;

import com.ruoyi.system.model.TInvoice;
import com.baomidou.mybatisplus.extension.service.IService;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/service/TItemService.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service;

import com.ruoyi.system.model.TItem;
import com.baomidou.mybatisplus.extension.service.IService;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/service/TItemTypeService.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service;

import com.ruoyi.system.model.TItemType;
import com.baomidou.mybatisplus.extension.service.IService;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/service/TSysConfigService.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service;

import com.ruoyi.system.model.TSysConfig;
import com.baomidou.mybatisplus.extension.service.IService;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/service/TTenantService.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service;

import com.ruoyi.system.model.TTenant;
import com.baomidou.mybatisplus.extension.service.IService;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service.impl;

import com.ruoyi.system.model.TBill;
import com.ruoyi.system.mapper.TBillMapper;
import com.ruoyi.system.service.TBillService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCheckAcceptRecordServiceImpl.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service.impl;

import com.ruoyi.system.model.TCheckAcceptRecord;
import com.ruoyi.system.mapper.TCheckAcceptRecordMapper;
import com.ruoyi.system.service.TCheckAcceptRecordService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractRentTypeServiceImpl.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service.impl;

import com.ruoyi.system.model.TContractRentType;
import com.ruoyi.system.mapper.TContractRentTypeMapper;
import com.ruoyi.system.service.TContractRentTypeService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service.impl;

import com.ruoyi.system.model.TContract;
import com.ruoyi.system.mapper.TContractMapper;
import com.ruoyi.system.service.TContractService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFaultAreaDicServiceImpl.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service.impl;

import com.ruoyi.system.model.TFaultAreaDic;
import com.ruoyi.system.mapper.TFaultAreaDicMapper;
import com.ruoyi.system.service.TFaultAreaDicService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFaultDescribeDicServiceImpl.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service.impl;

import com.ruoyi.system.model.TFaultDescribeDic;
import com.ruoyi.system.mapper.TFaultDescribeDicMapper;
import com.ruoyi.system.service.TFaultDescribeDicService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFaultRepairMessageServiceImpl.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service.impl;

import com.ruoyi.system.model.TFaultRepairMessage;
import com.ruoyi.system.mapper.TFaultRepairMessageMapper;
import com.ruoyi.system.service.TFaultRepairMessageService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFlowManagementServiceImpl.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service.impl;

import com.ruoyi.system.model.TFlowManagement;
import com.ruoyi.system.mapper.TFlowManagementMapper;
import com.ruoyi.system.service.TFlowManagementService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/THouseServiceImpl.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service.impl;

import com.ruoyi.system.model.THouse;
import com.ruoyi.system.mapper.THouseMapper;
import com.ruoyi.system.service.THouseService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInformationServiceImpl.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service.impl;

import com.ruoyi.system.model.TInformation;
import com.ruoyi.system.mapper.TInformationMapper;
import com.ruoyi.system.service.TInformationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service.impl;

import com.ruoyi.system.model.TInvoice;
import com.ruoyi.system.mapper.TInvoiceMapper;
import com.ruoyi.system.service.TInvoiceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TItemServiceImpl.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service.impl;

import com.ruoyi.system.model.TItem;
import com.ruoyi.system.mapper.TItemMapper;
import com.ruoyi.system.service.TItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TItemTypeServiceImpl.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service.impl;

import com.ruoyi.system.model.TItemType;
import com.ruoyi.system.mapper.TItemTypeMapper;
import com.ruoyi.system.service.TItemTypeService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysConfigServiceImpl.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service.impl;

import com.ruoyi.system.model.TSysConfig;
import com.ruoyi.system.mapper.TSysConfigMapper;
import com.ruoyi.system.service.TSysConfigService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTenantServiceImpl.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service.impl;

import com.ruoyi.system.model.TTenant;
import com.ruoyi.system.mapper.TTenantMapper;
import com.ruoyi.system.service.TTenantService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

 ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml

@@ -5,31 +5,31 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TBill">
        <id column="id" property="id" />
        <result column="contractId" property="contractId" />
        <result column="payableFeesMoney" property="payableFeesMoney" />
        <result column="payableFeesTime" property="payableFeesTime" />
        <result column="payFeesStatus" property="payFeesStatus" />
        <result column="payFeesMoney" property="payFeesMoney" />
        <result column="payFeesTime" property="payFeesTime" />
        <result column="payFeesType" property="payFeesType" />
        <result column="billType" property="billType" />
        <result column="overDays" property="overDays" />
        <result column="payableFeesPenalty" property="payableFeesPenalty" />
        <result column="startTime" property="startTime" />
        <result column="endTime" property="endTime" />
        <result column="bankSerialNumber" property="bankSerialNumber" />
        <result column="actualMoney" property="actualMoney" />
        <result column="contract_id" property="contractId" />
        <result column="payable_fees_money" property="payableFeesMoney" />
        <result column="payable_fees_time" property="payableFeesTime" />
        <result column="pay_fees_status" property="payFeesStatus" />
        <result column="pay_fees_money" property="payFeesMoney" />
        <result column="pay_fees_time" property="payFeesTime" />
        <result column="pay_fees_type" property="payFeesType" />
        <result column="bill_type" property="billType" />
        <result column="over_days" property="overDays" />
        <result column="payable_fees_penalty" property="payableFeesPenalty" />
        <result column="start_time" property="startTime" />
        <result column="end_time" property="endTime" />
        <result column="bank_serial_number" property="bankSerialNumber" />
        <result column="actual_money" property="actualMoney" />
        <result column="voucher" property="voucher" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="create_by" property="createBy" />
        <result column="update_by" property="updateBy" />
        <result column="disabled" property="disabled" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, contractId, payableFeesMoney, payableFeesTime, payFeesStatus, payFeesMoney, payFeesTime, payFeesType, billType, overDays, payableFeesPenalty, startTime, endTime, bankSerialNumber, actualMoney, voucher, createTime, updateTime, createBy, updateBy, isDelete
        id, contract_id, payable_fees_money, payable_fees_time, pay_fees_status, pay_fees_money, pay_fees_time, pay_fees_type, bill_type, over_days, payable_fees_penalty, start_time, end_time, bank_serial_number, actual_money, voucher, create_time, update_time, create_by, update_by, disabled
    </sql>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml

@@ -5,30 +5,30 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TCheckAcceptRecord">
        <id column="id" property="id" />
        <result column="contractId" property="contractId" />
        <result column="houseId" property="houseId" />
        <result column="checkTime" property="checkTime" />
        <result column="leaseReason" property="leaseReason" />
        <result column="checkPerson" property="checkPerson" />
        <result column="accompanyPerson" property="accompanyPerson" />
        <result column="overallSituation" property="overallSituation" />
        <result column="furnitureSituation" property="furnitureSituation" />
        <result column="deviceSituation" property="deviceSituation" />
        <result column="cleanSituation" property="cleanSituation" />
        <result column="otherProblem" property="otherProblem" />
        <result column="contract_id" property="contractId" />
        <result column="house_id" property="houseId" />
        <result column="check_time" property="checkTime" />
        <result column="lease_reason" property="leaseReason" />
        <result column="check_person" property="checkPerson" />
        <result column="accompany_person" property="accompanyPerson" />
        <result column="overall_situation" property="overallSituation" />
        <result column="furniture_situation" property="furnitureSituation" />
        <result column="device_situation" property="deviceSituation" />
        <result column="clean_situation" property="cleanSituation" />
        <result column="other_problem" property="otherProblem" />
        <result column="pictures" property="pictures" />
        <result column="checkResult" property="checkResult" />
        <result column="checkMoney" property="checkMoney" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
        <result column="check_result" property="checkResult" />
        <result column="check_money" property="checkMoney" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="create_by" property="createBy" />
        <result column="update_by" property="updateBy" />
        <result column="disabled" property="disabled" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, contractId, houseId, checkTime, leaseReason, checkPerson, accompanyPerson, overallSituation, furnitureSituation, deviceSituation, cleanSituation, otherProblem, pictures, checkResult, checkMoney, createTime, updateTime, createBy, updateBy, isDelete
        id, contract_id, house_id, check_time, lease_reason, check_person, accompany_person, overall_situation, furniture_situation, device_situation, clean_situation, other_problem, pictures, check_result, check_money, create_time, update_time, create_by, update_by, disabled
    </sql>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml

@@ -5,38 +5,38 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TContract">
        <id column="id" property="id" />
        <result column="contractNumber" property="contractNumber" />
        <result column="contractName" property="contractName" />
        <result column="startTime" property="startTime" />
        <result column="endTime" property="endTime" />
        <result column="totalRent" property="totalRent" />
        <result column="contract_number" property="contractNumber" />
        <result column="contract_name" property="contractName" />
        <result column="start_time" property="startTime" />
        <result column="end_time" property="endTime" />
        <result column="total_rent" property="totalRent" />
        <result column="deposit" property="deposit" />
        <result column="payType" property="payType" />
        <result column="firstPayTime" property="firstPayTime" />
        <result column="pay_type" property="payType" />
        <result column="first_pay_time" property="firstPayTime" />
        <result column="isIncreasing" property="isIncreasing" />
        <result column="isIncreasingDeposit" property="isIncreasingDeposit" />
        <result column="isIncreasing_deposit" property="isincreasingDeposit" />
        <result column="proportion" property="proportion" />
        <result column="houseId" property="houseId" />
        <result column="partyOneName" property="partyOneName" />
        <result column="partyOnePerson" property="partyOnePerson" />
        <result column="partyOnePhone" property="partyOnePhone" />
        <result column="tenantId" property="tenantId" />
        <result column="partyTwoName" property="partyTwoName" />
        <result column="partyTwoPerson" property="partyTwoPerson" />
        <result column="partyTwoPhone" property="partyTwoPhone" />
        <result column="contractFile" property="contractFile" />
        <result column="house_id" property="houseId" />
        <result column="party_one_name" property="partyOneName" />
        <result column="party_one_person" property="partyOnePerson" />
        <result column="party_one_phone" property="partyOnePhone" />
        <result column="tenant_id" property="tenantId" />
        <result column="party_two_name" property="partyTwoName" />
        <result column="party_two_person" property="partyTwoPerson" />
        <result column="party_two_phone" property="partyTwoPhone" />
        <result column="contract_file" property="contractFile" />
        <result column="remark" property="remark" />
        <result column="status" property="status" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="create_by" property="createBy" />
        <result column="update_by" property="updateBy" />
        <result column="disabled" property="disabled" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, contractNumber, contractName, startTime, endTime, totalRent, deposit, payType, firstPayTime, isIncreasing, isIncreasingDeposit, proportion, houseId, partyOneName, partyOnePerson, partyOnePhone, tenantId, partyTwoName, partyTwoPerson, partyTwoPhone, contractFile, remark, status, createTime, updateTime, createBy, updateBy, isDelete
        id, contract_number, contract_name, start_time, end_time, total_rent, deposit, pay_type, first_pay_time, isIncreasing, isIncreasing_deposit, proportion, house_id, party_one_name, party_one_person, party_one_phone, tenant_id, party_two_name, party_two_person, party_two_phone, contract_file, remark, status, create_time, update_time, create_by, update_by, disabled
    </sql>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TContractRentTypeMapper.xml

@@ -5,15 +5,15 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TContractRentType">
        <id column="id" property="id" />
        <result column="contractId" property="contractId" />
        <result column="IncreasingDecreasing" property="IncreasingDecreasing" />
        <result column="IncreasingDecreasingType" property="IncreasingDecreasingType" />
        <result column="numericalValue" property="numericalValue" />
        <result column="contract_id" property="contractId" />
        <result column="Increasing_decreasing" property="increasingDecreasing" />
        <result column="Increasing_decreasing_type" property="increasingDecreasingType" />
        <result column="numerical_value" property="numericalValue" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, contractId, IncreasingDecreasing, IncreasingDecreasingType, numericalValue
        id, contract_id, Increasing_decreasing, Increasing_decreasing_type, numerical_value
    </sql>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TFaultAreaDicMapper.xml

@@ -5,12 +5,12 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TFaultAreaDic">
        <id column="id" property="id" />
        <result column="faultAreaName" property="faultAreaName" />
        <result column="fault_area_name" property="faultAreaName" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, faultAreaName
        id, fault_area_name
    </sql>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TFaultDescribeDicMapper.xml

@@ -5,13 +5,13 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TFaultDescribeDic">
        <id column="id" property="id" />
        <result column="faultId" property="faultId" />
        <result column="describeName" property="describeName" />
        <result column="fault_id" property="faultId" />
        <result column="describe_name" property="describeName" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, faultId, describeName
        id, fault_id, describe_name
    </sql>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml

@@ -5,33 +5,33 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TFaultRepairMessage">
        <id column="id" property="id" />
        <result column="appUserId" property="appUserId" />
        <result column="itemId" property="itemId" />
        <result column="faultAreaName" property="faultAreaName" />
        <result column="describeName" property="describeName" />
        <result column="describeDetail" property="describeDetail" />
        <result column="faultPictures" property="faultPictures" />
        <result column="serviceAddress" property="serviceAddress" />
        <result column="repairType" property="repairType" />
        <result column="visitTime" property="visitTime" />
        <result column="contactNumber" property="contactNumber" />
        <result column="leaveMessage" property="leaveMessage" />
        <result column="handlePerson" property="handlePerson" />
        <result column="handleTime" property="handleTime" />
        <result column="reaultDescribe" property="reaultDescribe" />
        <result column="repairPicture" property="repairPicture" />
        <result column="app_user_id" property="appUserId" />
        <result column="item_id" property="itemId" />
        <result column="fault_area_name" property="faultAreaName" />
        <result column="describe_name" property="describeName" />
        <result column="describe_detail" property="describeDetail" />
        <result column="fault_pictures" property="faultPictures" />
        <result column="service_address" property="serviceAddress" />
        <result column="repair_type" property="repairType" />
        <result column="visit_time" property="visitTime" />
        <result column="contact_number" property="contactNumber" />
        <result column="leave_message" property="leaveMessage" />
        <result column="handle_person" property="handlePerson" />
        <result column="handle_time" property="handleTime" />
        <result column="reault_describe" property="reaultDescribe" />
        <result column="repair_picture" property="repairPicture" />
        <result column="attachment" property="attachment" />
        <result column="status" property="status" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="create_by" property="createBy" />
        <result column="update_by" property="updateBy" />
        <result column="disabled" property="disabled" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, appUserId, itemId, faultAreaName, describeName, describeDetail, faultPictures, serviceAddress, repairType, visitTime, contactNumber, leaveMessage, handlePerson, handleTime, reaultDescribe, repairPicture, attachment, status, createTime, updateTime, createBy, updateBy, isDelete
        id, app_user_id, item_id, fault_area_name, describe_name, describe_detail, fault_pictures, service_address, repair_type, visit_time, contact_number, leave_message, handle_person, handle_time, reault_describe, repair_picture, attachment, status, create_time, update_time, create_by, update_by, disabled
    </sql>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TFlowManagementMapper.xml

@@ -5,27 +5,27 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TFlowManagement">
        <id column="id" property="id" />
        <result column="sysSerialNumber" property="sysSerialNumber" />
        <result column="bankSerialNumber" property="bankSerialNumber" />
        <result column="flowMoney" property="flowMoney" />
        <result column="deductionMoney" property="deductionMoney" />
        <result column="remainingMoney" property="remainingMoney" />
        <result column="payTime" property="payTime" />
        <result column="sys_serial_number" property="sysSerialNumber" />
        <result column="bank_serial_number" property="bankSerialNumber" />
        <result column="flow_money" property="flowMoney" />
        <result column="deduction_money" property="deductionMoney" />
        <result column="remaining_money" property="remainingMoney" />
        <result column="pay_time" property="payTime" />
        <result column="payer" property="payer" />
        <result column="flowStatus" property="flowStatus" />
        <result column="flowType" property="flowType" />
        <result column="payType" property="payType" />
        <result column="paymentBillId" property="paymentBillId" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
        <result column="flow_status" property="flowStatus" />
        <result column="flow_type" property="flowType" />
        <result column="pay_type" property="payType" />
        <result column="payment_bill_id" property="paymentBillId" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="create_by" property="createBy" />
        <result column="update_by" property="updateBy" />
        <result column="disabled" property="disabled" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, sysSerialNumber, bankSerialNumber, flowMoney, deductionMoney, remainingMoney, payTime, payer, flowStatus, flowType, payType, paymentBillId, createTime, updateTime, createBy, updateBy, isDelete
        id, sys_serial_number, bank_serial_number, flow_money, deduction_money, remaining_money, pay_time, payer, flow_status, flow_type, pay_type, payment_bill_id, create_time, update_time, create_by, update_by, disabled
    </sql>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml

@@ -5,28 +5,28 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.THouse">
        <id column="id" property="id" />
        <result column="housePicture" property="housePicture" />
        <result column="houseName" property="houseName" />
        <result column="houseAddress" property="houseAddress" />
        <result column="houseArea" property="houseArea" />
        <result column="houseType" property="houseType" />
        <result column="businessAttributes" property="businessAttributes" />
        <result column="productType" property="productType" />
        <result column="propertyRightPerson" property="propertyRightPerson" />
        <result column="propertyRightNumber" property="propertyRightNumber" />
        <result column="propertyRightStartTime" property="propertyRightStartTime" />
        <result column="propertyRightDuration" property="propertyRightDuration" />
        <result column="leaseStatus" property="leaseStatus" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
        <result column="house_picture" property="housePicture" />
        <result column="house_name" property="houseName" />
        <result column="house_address" property="houseAddress" />
        <result column="house_area" property="houseArea" />
        <result column="house_type" property="houseType" />
        <result column="business_attributes" property="businessAttributes" />
        <result column="product_type" property="productType" />
        <result column="property_right_person" property="propertyRightPerson" />
        <result column="property_right_number" property="propertyRightNumber" />
        <result column="property_right_start_time" property="propertyRightStartTime" />
        <result column="property_right_duration" property="propertyRightDuration" />
        <result column="lease_status" property="leaseStatus" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="create_by" property="createBy" />
        <result column="update_by" property="updateBy" />
        <result column="disabled" property="disabled" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, housePicture, houseName, houseAddress, houseArea, houseType, businessAttributes, productType, propertyRightPerson, propertyRightNumber, propertyRightStartTime, propertyRightDuration, leaseStatus, createTime, updateTime, createBy, updateBy, isDelete
        id, house_picture, house_name, house_address, house_area, house_type, business_attributes, product_type, property_right_person, property_right_number, property_right_start_time, property_right_duration, lease_status, create_time, update_time, create_by, update_by, disabled
    </sql>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TInformationMapper.xml

@@ -5,22 +5,22 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TInformation">
        <id column="id" property="id" />
        <result column="titleName" property="titleName" />
        <result column="sortBy" property="sortBy" />
        <result column="infoSource" property="infoSource" />
        <result column="releaseTime" property="releaseTime" />
        <result column="title_name" property="titleName" />
        <result column="sort_by" property="sortBy" />
        <result column="info_source" property="infoSource" />
        <result column="release_time" property="releaseTime" />
        <result column="content" property="content" />
        <result column="attachment" property="attachment" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="create_by" property="createBy" />
        <result column="update_by" property="updateBy" />
        <result column="disabled" property="disabled" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, titleName, sortBy, infoSource, releaseTime, content, attachment, createTime, updateTime, createBy, updateBy, isDelete
        id, title_name, sort_by, info_source, release_time, content, attachment, create_time, update_time, create_by, update_by, disabled
    </sql>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TInvoiceMapper.xml

@@ -5,27 +5,27 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TInvoice">
        <id column="id" property="id" />
        <result column="invoiceNumber" property="invoiceNumber" />
        <result column="invoiceMoney" property="invoiceMoney" />
        <result column="applyName" property="applyName" />
        <result column="titleType" property="titleType" />
        <result column="titleName" property="titleName" />
        <result column="serialNumber" property="serialNumber" />
        <result column="invoice_number" property="invoiceNumber" />
        <result column="invoice_money" property="invoiceMoney" />
        <result column="apply_name" property="applyName" />
        <result column="title_type" property="titleType" />
        <result column="title_name" property="titleName" />
        <result column="serial_number" property="serialNumber" />
        <result column="status" property="status" />
        <result column="invoiceTime" property="invoiceTime" />
        <result column="invoiceVoucher" property="invoiceVoucher" />
        <result column="invoice_time" property="invoiceTime" />
        <result column="invoice_voucher" property="invoiceVoucher" />
        <result column="email" property="email" />
        <result column="contractNumber" property="contractNumber" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
        <result column="contract_number" property="contractNumber" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="create_by" property="createBy" />
        <result column="update_by" property="updateBy" />
        <result column="disabled" property="disabled" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, invoiceNumber, invoiceMoney, applyName, titleType, titleName, serialNumber, status, invoiceTime, invoiceVoucher, email, contractNumber, createTime, updateTime, createBy, updateBy, isDelete
        id, invoice_number, invoice_money, apply_name, title_type, title_name, serial_number, status, invoice_time, invoice_voucher, email, contract_number, create_time, update_time, create_by, update_by, disabled
    </sql>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TItemMapper.xml

@@ -5,20 +5,20 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TItem">
        <id column="id" property="id" />
        <result column="typeId" property="typeId" />
        <result column="itemName" property="itemName" />
        <result column="sortBy" property="sortBy" />
        <result column="type_id" property="typeId" />
        <result column="item_name" property="itemName" />
        <result column="sort_by" property="sortBy" />
        <result column="pictures" property="pictures" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="create_by" property="createBy" />
        <result column="update_by" property="updateBy" />
        <result column="disabled" property="disabled" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, typeId, itemName, sortBy, pictures, createTime, updateTime, createBy, updateBy, isDelete
        id, type_id, item_name, sort_by, pictures, create_time, update_time, create_by, update_by, disabled
    </sql>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TItemTypeMapper.xml

@@ -5,18 +5,18 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TItemType">
        <id column="id" property="id" />
        <result column="typeName" property="typeName" />
        <result column="sortBy" property="sortBy" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
        <result column="type_name" property="typeName" />
        <result column="sort_by" property="sortBy" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="create_by" property="createBy" />
        <result column="update_by" property="updateBy" />
        <result column="disabled" property="disabled" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, typeName, sortBy, createTime, updateTime, createBy, updateBy, isDelete
        id, type_name, sort_by, create_time, update_time, create_by, update_by, disabled
    </sql>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TSysConfigMapper.xml

@@ -5,14 +5,14 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TSysConfig">
        <id column="id" property="id" />
        <result column="systemName" property="systemName" />
        <result column="companyName" property="companyName" />
        <result column="system_name" property="systemName" />
        <result column="company_name" property="companyName" />
        <result column="phone" property="phone" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, systemName, companyName, phone
        id, system_name, company_name, phone
    </sql>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TTenantMapper.xml

@@ -5,28 +5,28 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TTenant">
        <id column="id" property="id" />
        <result column="residentName" property="residentName" />
        <result column="checkInTime" property="checkInTime" />
        <result column="tenantAttributes" property="tenantAttributes" />
        <result column="tenantType" property="tenantType" />
        <result column="tenantBuilding" property="tenantBuilding" />
        <result column="roomNumber" property="roomNumber" />
        <result column="buildingArea" property="buildingArea" />
        <result column="resident_name" property="residentName" />
        <result column="checkIn_time" property="checkinTime" />
        <result column="tenant_attributes" property="tenantAttributes" />
        <result column="tenant_type" property="tenantType" />
        <result column="tenant_building" property="tenantBuilding" />
        <result column="room_number" property="roomNumber" />
        <result column="building_area" property="buildingArea" />
        <result column="phone" property="phone" />
        <result column="idCard" property="idCard" />
        <result column="id_card" property="idCard" />
        <result column="email" property="email" />
        <result column="bankNumber" property="bankNumber" />
        <result column="mailAddress" property="mailAddress" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
        <result column="bank_number" property="bankNumber" />
        <result column="mail_address" property="mailAddress" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="create_by" property="createBy" />
        <result column="update_by" property="updateBy" />
        <result column="disabled" property="disabled" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, residentName, checkInTime, tenantAttributes, tenantType, tenantBuilding, roomNumber, buildingArea, phone, idCard, email, bankNumber, mailAddress, createTime, updateTime, createBy, updateBy, isDelete
        id, resident_name, checkIn_time, tenant_attributes, tenant_type, tenant_building, room_number, building_area, phone, id_card, email, bank_number, mail_address, create_time, update_time, create_by, update_by, disabled
    </sql>

</mapper>

 sql/xizang.sql

Diff too large