fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

1
2
3
4
5
6
7
8
9
package com.ruoyi.system.mapper;
 
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.model.StateProcessInstanceAction;
 
public interface StateProcessInstanceActionMapper extends BaseMapper<StateProcessInstanceAction> {
    void saveData(StateProcessInstanceAction stateProcessInstanceAction);
 
}