fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

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

New file
@@ -0,0 +1,122 @@
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.LocalDate;
import java.time.LocalDateTime;
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;
import lombok.EqualsAndHashCode;

/**
 * <p>
 * 报修管理
 * </p>
 *
 * @author xiaochen
 * @since 2025-01-20
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_fault_repair_message")
@ApiModel(value="TFaultRepairMessage对象", description="报修管理")
public class TFaultRepairMessage extends BaseModel {

    private static final long serialVersionUID = 1L;

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

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

    @ApiModelProperty(value = "物品分类id")
    @TableField("item_type_id")
    private String itemTypeId;

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

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

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

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

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

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

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

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

    @ApiModelProperty(value = "上门时间")
    @TableField("visit_time")
    private String visitTime;

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

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

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

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

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

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

    @ApiModelProperty(value = "附件")
    @TableField("attachment")
    private String attachment;

    @ApiModelProperty(value = "附件名称  逗号分割")
    @TableField("attachment_name")
    private String attachmentName;
    @ApiModelProperty(value = "维修单号")
    @TableField("code")
    private String code;

    @ApiModelProperty(value = "状态 1=待处理 2=已处理")
    @TableField("status")
    private Integer status;

}