Merge remote-tracking branch 'origin/master'

沈斌

2017-10-25 58f51c889aecd7065a82b99d29b3ef4aee891ec1

 src/main/resources/application.xml

@@ -48,5 +48,7 @@


    <import resource="database.xml"/>

    <import resource="rabbitmq.xml"/>

    <import resource="quartz.xml"/>

    <!-- 
     <import resource="quartz.xml"/>

     -->

</beans>