fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/StateProcessInstanceActionMapper.java

@@ -4,4 +4,6 @@
import com.ruoyi.system.model.StateProcessInstanceAction;

public interface StateProcessInstanceActionMapper extends BaseMapper<StateProcessInstanceAction> {
    void saveData(StateProcessInstanceAction stateProcessInstanceAction);

}