Commit 2f4953e0 authored by zhangjinzhou's avatar zhangjinzhou

Merge branch 'master' of gitlab2.dui88.com:wildfirecode13/icbcrpg into 引导load选人

# Conflicts:
#	project/package-lock.json
parents b329d8dd 34ba32db
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
}, },
"dependencies": { "dependencies": {
"@spark/api-base": "^1.0.11", "@spark/api-base": "^1.0.11",
"@spark/guideact": "^1.0.10", "@spark/guideact": "^1.0.11",
"@spark/projectx": "^1.0.3", "@spark/projectx": "^1.0.3",
"@spark/share": "^1.0.29", "@spark/share": "^1.0.29",
"@spark/ui": "^1.0.25", "@spark/ui": "^1.0.25",
......
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