Merge remote-tracking branch 'origin/master'

pom.xml

@@ -121,10 +121,6 @@
            <artifactId>commons-redis-mq</artifactId>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.yihu.ehr</groupId>
            <artifactId>commons-util</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu.ehr</groupId>
            <artifactId>commons-data-solr</artifactId>