Commit bc78773b authored by 喻天's avatar 喻天

Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/CivWeb

# Conflicts: # package.json
parents 300e10b6 fce2b32f
Pipeline #48256 passed with stages
in 6 minutes 50 seconds
...@@ -106,9 +106,9 @@ ...@@ -106,9 +106,9 @@
"@wisdom-cesium/cesium": "^1.0.75", "@wisdom-cesium/cesium": "^1.0.75",
"@wisdom-components/basictable": "^1.5.16", "@wisdom-components/basictable": "^1.5.16",
"@wisdom-components/empty": "^1.4.1", "@wisdom-components/empty": "^1.4.1",
"@wisdom-map/Amap": "^1.0.49-10", "@wisdom-map/Amap": "^1.0.49-11",
"@wisdom-map/Map": "^1.0.12-19", "@wisdom-map/Map": "^1.0.12-23",
"@wisdom-map/arcgismap": "^1.0.79-19", "@wisdom-map/arcgismap": "^1.0.79-23",
"@wisdom-map/util": "^1.0.27-0", "@wisdom-map/util": "^1.0.27-0",
"@wisdom-utils/components": "0.1.58", "@wisdom-utils/components": "0.1.58",
"@wisdom-utils/runtime": "0.0.15", "@wisdom-utils/runtime": "0.0.15",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment