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

# Conflicts: # project/package-lock.json

Merge branch 'master' of gitlab2.dui88.com:wildfirecode13/icbcrpg into 引导load选人
# Conflicts: # project/package-lock.json
2f4953e0 · zhangjinzhou · b329d8dd · 34ba32db · 2f4953e0
Commit 2f4953e0 authored Dec 30, 2020 by zhangjinzhou
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

package.json project/package.json +1 -1

No files found.
--- a/project/package.json
+++ b/project/package.json
@@ -10,7 +10,7 @@
  },
  "dependencies": {
    "@spark/api-base": "^1.0.11",
-    "@spark/guideact": "^1.0.10",
+    "@spark/guideact": "^1.0.11",
    "@spark/projectx": "^1.0.3",
    "@spark/share": "^1.0.29",
    "@spark/ui": "^1.0.25",