fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

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

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.mapper.StateProcessInstanceActionMapper;
import com.ruoyi.system.model.StateProcessInstanceAction;
import com.ruoyi.system.service.StateProcessInstanceActionService;
import org.springframework.stereotype.Service;

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