fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
package com.ruoyi.system.vo;
 
import com.ruoyi.system.model.TFaultDescribeDic;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
 
@Data
@ApiModel(value = "故障描述VO")
public class TFaultDescribeDicVO extends TFaultDescribeDic {
 
    @ApiModelProperty(value = "故障区域名称")
    private String faultAreaName;
 
}