fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

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

@@ -1,7 +1,11 @@
package com.ruoyi.system.service;

import com.ruoyi.system.model.TFaultRepairMessage;
import com.baomidou.mybatisplus.extension.service.IService;
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;

/**
 * <p>
@@ -13,4 +17,18 @@
 */
public interface TFaultRepairMessageService extends IService<TFaultRepairMessage> {

    /**
     * 查看报修详情
     * @param id
     * @return
     */
    TFaultRepairMessageVO getDetailById(String id);

    /**
     * 获取报修分页列表
     * @param query
     * @return
     */
    PageInfo<TFaultRepairMessageVO> pageList(TFaultRepairMessageQuery query);
    PageInfo<TFaultRepairMessageVO> pageListApplet(TFaultRepairMessageAppletQuery query);
}