Merge branch 'dev' of http://192.168.1.220:10080/jiwei/wlyy2.0 into dev

Conflicts:
	svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/servicePackage/ServicePackageEndpoint.java

wlyy-lib-parent-pom/pom.xml

@@ -25,6 +25,7 @@
        <module>../common/common-util</module>
        <module>../common/common-fegin</module>
        <module>../common/common-web</module>
        <module>../common/common-tracer</module>
    </modules>
</project>