fix conflect

wzy

2021-11-11 8f7460c6ddff45ec39bf2026d75a3f4e2b26f13d

 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;