fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

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

New file
@@ -0,0 +1,39 @@
package com.ruoyi.system.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TFaultRepairMessage;
import com.ruoyi.system.query.TFaultRepairMessageAppletQuery;
import com.ruoyi.system.query.TFaultRepairMessageQuery;
import com.ruoyi.system.vo.TFaultRepairMessageVO;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
 * 报修管理 Mapper 接口
 * </p>
 *
 * @author xiaochen
 * @since 2025-01-17
 */
public interface TFaultRepairMessageMapper extends BaseMapper<TFaultRepairMessage> {

    /**
     * 根据id查询报修管理
     * @param id
     * @return
     */
    TFaultRepairMessageVO getDetailById(@Param("id") String id);

    /**
     * 分页查询报修管理
     * @param query
     * @param pageInfo
     * @return
     */
    List<TFaultRepairMessageVO> pageList(@Param("query") TFaultRepairMessageQuery query, @Param("pageInfo")PageInfo<TFaultRepairMessageVO> pageInfo);
    List<TFaultRepairMessageVO> pageListApplet(@Param("query") TFaultRepairMessageAppletQuery query, @Param("pageInfo")PageInfo<TFaultRepairMessageVO> pageInfo);

}