fix conflect

Helius

2021-11-17 792a502dd95cadccbef8121673e6b5059a2c3550

 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;