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/pom.xml

@@ -151,10 +151,6 @@
            <groupId>org.apache.activemq</groupId>
            <artifactId>activemq-camel</artifactId>
        </dependency>
        <dependency>
            <groupId>org.apache.activemq</groupId>
            <artifactId>activemq-core</artifactId>
        </dependency>
        <!--Swagger start -->
        <dependency>
            <groupId>io.springfox</groupId>

patient-co/patient-co-wlyy/pom.xml

@@ -152,10 +152,6 @@
            <groupId>org.apache.activemq</groupId>
            <artifactId>activemq-camel</artifactId>
        </dependency>
        <dependency>
            <groupId>org.apache.activemq</groupId>
            <artifactId>activemq-core</artifactId>
        </dependency>
        <!--activemq end-->
        <!--Swagger start -->
        <dependency>