Merge branch 'master' of chenweida/esb into master

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourcerest/resourceRestDialog.jsp

@@ -55,7 +55,7 @@
    <!-- 隐藏字段 -->
    <div class="m-form-group" style="display: none;">
        <input data-attr-scan="id" hidden="hidden"/>
        <input name="id" hidden="hidden"/>
    </div>
    <div class="m-form-bottom">