fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

1
2
3
4
5
6
7
8
9
10
package com.ruoyi.system.dto;
 
import com.ruoyi.system.model.TFaultRepairMessage;
import io.swagger.annotations.ApiModel;
import lombok.Data;
 
@Data
@ApiModel(value = "报修dto")
public class TFaultRepairMessageDTO extends TFaultRepairMessage {
}