合并代码

wuxw

2019-12-16 bdfb519e59d7119dcf5835a4b6ebd6c4d2006470

 WebService/src/main/resources/components/pageFramePackage/common/commonTop.html

@@ -4,6 +4,7 @@
<link href="/css/plugins/toastr/toastr.min.css" rel="stylesheet"/>
<!-- Gritter -->
<link href="/js/plugins/gritter/jquery.gritter.css" rel="stylesheet"/>
<link href="/css/plugins/select2/select2.min.css" rel="stylesheet">
<link href="/css/animate.css" rel="stylesheet"/>
<link href="/css/style.css" rel="stylesheet"/>
<link rel="stylesheet" href="/css/common.css"/>
@@ -19,6 +20,8 @@
<!--<script src="/js/bootstrap/bootstrap-datetimepicker.min.js"></script>-->
<script src="/js/bootstrap/bootstrap-datetimepicker.js"></script>
<script src="/js/bootstrap/bootstrap-datetimepicker.zh-CN.js"></script>
<script src="/js/plugins/select2/select2.full.min.js"></script>

<script type="text/javascript">

    console.log('############################################################');