fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

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

New file
@@ -0,0 +1,25 @@
package com.ruoyi.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TFaultDescribeDic;
import com.ruoyi.system.query.TFaultDescribeDicQuery;
import com.ruoyi.system.vo.TFaultDescribeDicVO;

/**
 * <p>
 * 故障描述 服务类
 * </p>
 *
 * @author xiaochen
 * @since 2025-01-17
 */
public interface TFaultDescribeDicService extends IService<TFaultDescribeDic> {

    /**
     * 获取故障描述分页列表
     * @param query
     * @return
     */
    PageInfo<TFaultDescribeDicVO> pageList(TFaultDescribeDicQuery query);
}