Merge branch 'master' of chenweida/esb into master

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"
                    }
                });
            });