Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

Conflicts:
	patient-co/patient-co-wlyy/src/main/resources/application.yml

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/event/ApplicationEvent.java

@@ -100,7 +100,7 @@ public class ApplicationEvent implements ApplicationListener<ContextRefreshedEve
            // 启动redis 消息队列线程
            logger.info("redis message start");
          //  new Thread(redisThread).start();
            new Thread(redisThread).start();
            logger.info("redis message end");
        } catch (Exception e) {