fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessInstanceActionServiceImpl.java

@@ -8,4 +8,8 @@

@Service
public class StateProcessInstanceActionServiceImpl extends ServiceImpl<StateProcessInstanceActionMapper, StateProcessInstanceAction> implements StateProcessInstanceActionService {
    @Override
    public void saveData(StateProcessInstanceAction stateProcessInstanceAction) {
        this.baseMapper.saveData(stateProcessInstanceAction);
    }
}