fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.model.TContractRentType;

/**
 * <p>
 * 租金递增递减方式 服务类
 * </p>
 *
 * @author xiaochen
 * @since 2025-01-17
 */
public interface TContractRentTypeService extends IService<TContractRentType> {

}