Merge branch 'master' of http://192.168.1.220:10080/esb/esb

Hos-Framework/pom.xml

@@ -6,7 +6,7 @@
    <groupId>com.yihu.hos.resource</groupId>
    <artifactId>Hos-Framework</artifactId>
    <version>1.0.1</version>
    <version>1.0.2</version>
    <parent>
        <groupId>com.yihu.core</groupId>
        <artifactId>Hos-Framework-dependencies</artifactId>

Hos-resource/pom.xml

@@ -63,7 +63,7 @@
        <dependency>
            <groupId>com.yihu.hos.resource</groupId>
            <artifactId>Hos-Framework</artifactId>
            <version>1.0.1</version>
            <version>1.0.2</version>
        </dependency>
        <!--<dependency>-->
        <!--<groupId>com.yihu.ehr</groupId>-->

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceAuthorizeJs.jsp

@@ -26,7 +26,7 @@
                        pid: "3",
                        text: "资源注册",
                        treedataindex: "10",
                        url: "/resource/resource/initial"
                        url: "${contextRoot}/resource/resource/initial"
                    }
                });
            });