修复合并

src/main/resources/templates/mz/toll_administration.html

@@ -931,14 +931,16 @@
 <!--读卡查询弹窗结尾-->
 
 
-<<<<<<< HEAD
-<!--读卡进行的弹窗loading-->
 <div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="readLoadingModal" data-backdrop="static" data-keyboard="false" style="margin-top: 50px;">
     <div class="modal-dialog modal-lg">
         <div class="modal-content" style="width: 700px;margin-left: 200px;">
             <div class="modal-body">
                 <h1 style="height: 200px;line-height: 200px;text-align: center;"> 正在读卡中，请稍等... </h1>
-=======
+            </div>
+        </div>
+    </div>
+</div>
+
 <!--医保身份详情窗口-->
 <div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="insurDetailModal">
     <div class="modal-dialog modal-lg">
@@ -1033,15 +1035,11 @@
             <div class="modal-footer">
                 <button type="button"  class="btn btn-primary"   onclick="initInsurDetail()">读卡查询医保身份</button>
                 <button type="button" class="btn btn-default" onclick="closedInsurDetailModal()">关闭</button>
->>>>>>> origin/淮海科技
             </div>
         </div>
     </div>
 </div>
-<<<<<<< HEAD
-=======
 
->>>>>>> origin/淮海科技
 <!--医保结算弹窗开始-->
 <div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="loadingModal" data-backdrop="static" data-keyboard="false" style="margin-top: 50px;">
     <div class="modal-dialog modal-lg">