fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

 ruoyi-system/src/main/java/com/ruoyi/system/task/jobs/StateProcessJob.java

@@ -40,7 +40,7 @@
         stateProcessTemplateService.agree(processAgreeBO);
         // 短信发送
         SysUser sysUser = sysUserService.selectUserById(Long.valueOf(flwTaskActor.getActorId()));
         smsUtil.sendSms(sysUser.getPhonenumber(), "2369951", new String[]{""});
         smsUtil.sendSms(sysUser.getPhonenumber(), "2369951", new String[]{});
      }catch(Exception e){
         e.printStackTrace();
      }