Merge branch 'master' of http://192.168.1.220:10080/EHR/svr-pack-mgr

pom.xml

@@ -9,6 +9,7 @@
    </parent>
    <artifactId>svr-pack-mgr</artifactId>
    <version>1.13.0</version>
    <!--<packaging>${packaging.type}</packaging>-->
    <packaging>war</packaging>