beauty-erp.git - Gitblit

summary
reflog
commits
tree
docs
forks
compare

Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2022-01-24 6d78f8ab222498d727e91983d0511d8119d95aa3

 zq-erp/src/main/resources/static/js/plugin/kindeditor/plugins/baidumap/map.html

@@ -7,7 +7,7 @@
         html { height: 100% }
         body { height: 100%; margin: 0; padding: 0; background-color: #FFF }
      </style>
      <script charset="utf-8" src="http://api.map.baidu.com/api?v=1.3"></script>
      <script charset="utf-8" src="https://api.map.baidu.com/api?v=1.3"></script>
      <script>
         var map, geocoder;
         function initialize() {

			@@ -7,7 +7,7 @@
			html { height: 100% }
			body { height: 100%; margin: 0; padding: 0; background-color: #FFF }
			</style>
			<script charset="utf-8" src="http://api.map.baidu.com/api?v=1.3"></script>
			<script charset="utf-8" src="https://api.map.baidu.com/api?v=1.3"></script>
			<script>
			var map, geocoder;
			function initialize() {