fix conflect

wzy

2021-11-11 8f7460c6ddff45ec39bf2026d75a3f4e2b26f13d

 zq-erp/src/main/resources/templates/views/admin/hive/orgment/shopInfo-form.html

@@ -13,7 +13,7 @@
   th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
<script type="text/javascript" th:src="@{/js/systools/MBase.js}"></script>

   <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=Oego4OzlvPRPNyjCPTctXtuVNsSissOX"></script>
   <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=Oego4OzlvPRPNyjCPTctXtuVNsSissOX"></script>


</head>