From 8f7460c6ddff45ec39bf2026d75a3f4e2b26f13d Mon Sep 17 00:00:00 2001 From: wzy <wzy19931122ai@163.com> Date: Thu, 11 Nov 2021 23:01:58 +0800 Subject: [PATCH] fix conflect --- zq-erp/src/main/java/com/matrix/system/job/ServiceOvertimeNoticeJob.java | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/job/ServiceOvertimeNoticeJob.java b/zq-erp/src/main/java/com/matrix/system/job/ServiceOvertimeNoticeJob.java index aeeae57..e12431a 100644 --- a/zq-erp/src/main/java/com/matrix/system/job/ServiceOvertimeNoticeJob.java +++ b/zq-erp/src/main/java/com/matrix/system/job/ServiceOvertimeNoticeJob.java @@ -29,8 +29,6 @@ @Value("${evn}") private String evn; - @Autowired - private RabiitMqTemplate rabiitMqTemplate; @Autowired private AsyncMessageManager asyncMessageManager; -- Gitblit v1.9.1