Merge remote-tracking branch 'origin/master'

xuhy

2025-10-31 d0a8a2af8ce2a07be6ec1dff70f8246ec2e9c263

 ruoyi-system/src/main/java/com/ruoyi/system/task/base/AbstractJob.java

@@ -4,7 +4,9 @@
import com.aizuda.bpm.mybatisplus.mapper.FlwTaskMapper;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.system.model.TErpProcurement;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.TErpProcurementService;
import com.ruoyi.system.service.TSysAppUserService;
import com.ruoyi.system.service.TSysLiveService;
import com.ruoyi.system.task.utils.SpringContextsUtil;
@@ -26,6 +28,7 @@
   protected RedisCache redisCache;
   protected TSysAppUserService sysAppUserService;
   protected TemplateMessageSendUtil templateMessageSendUtil;
   protected TErpProcurementService erpProcurementService;

   public AbstractJob(){
      this.sysUserService = SpringContextsUtil.getBean(ISysUserService.class);
@@ -33,6 +36,7 @@
      this.redisCache = SpringContextsUtil.getBean(RedisCache.class);
      this.sysAppUserService = SpringContextsUtil.getBean(TSysAppUserService.class);
      this.templateMessageSendUtil = SpringContextsUtil.getBean(TemplateMessageSendUtil.class);
      this.erpProcurementService = SpringContextsUtil.getBean(TErpProcurementService.class);
   }