fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

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

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

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

import java.util.List;

/**
 * <p>
 * 订单表与账单的关联表 服务类
 * </p>
 *
 * @author xiaochen
 * @since 2025-02-07
 */
public interface TOrderBillService extends IService<TOrderBill> {

    List<TOrderBill> getByOrderNo(String orderNo);

}