Merge branch 'master' of lulihong0928/esb into master

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/standard/integration/configurationJs.jsp

@@ -3,7 +3,6 @@
<link href="${contextRoot}/develop/lib/select2/select2.min.css" rel="stylesheet">
<script src="${contextRoot}/develop/lib/select2/select2.js"></script>
<script >
  (function ($, win) {
      /* ************************** 全局变量定义 **************************** */
      var status = $("#publish_status").val();
      var Util = $.Util;
@@ -730,5 +729,4 @@
        $(function () {
          pageInit();
        });
  })(jQuery, window);
</script>