From db4c4b2d2fa585621236d9beccf4381c660aae8a Mon Sep 17 00:00:00 2001 From: shaoyuyishiwo <523314409@qq.com> Date: Sun, 29 Dec 2019 14:11:07 +0000 Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/master' into dev # Conflicts: # .idea/misc.xml # .idea/workspace.xml # dist/index.html # dist/static/js/manifest.2ae2e69a05c33dfc65f8.js.map # frontend/package.json # frontend/src/views/Home.vue # frontend/src/views/Project.vue --- .idea/workspace.xml | 144 ++++++++++-------- dist/index.html | 2 +- .../app.040e9964d8ea2489efcdcc40708e43f8.css | 6 - ...p.040e9964d8ea2489efcdcc40708e43f8.css.map | 1 - .../app.2392859d9d9ca73ef90dcaf7d70771d9.css | 6 - ...p.2392859d9d9ca73ef90dcaf7d70771d9.css.map | 1 - .../app.5b8cadb1c68ed783d588567f669ded4e.css | 6 - ...p.5b8cadb1c68ed783d588567f669ded4e.css.map | 1 - dist/static/img/planetPoster.cd6a198.jpg | Bin 71684 -> 0 bytes dist/static/js/app.15c833a883292742bcea.js | 2 - .../static/js/app.15c833a883292742bcea.js.map | 1 - dist/static/js/app.879aaf457c431ea53788.js | 2 - .../static/js/app.879aaf457c431ea53788.js.map | 1 - dist/static/js/app.f83b0cd33cf14451fb0d.js | 2 - .../static/js/app.f83b0cd33cf14451fb0d.js.map | 1 - .../js/manifest.2ae2e69a05c33dfc65f8.js.map | 2 +- dist/static/js/vendor.561d4f5b1644c4d523f1.js | 41 ----- .../js/vendor.561d4f5b1644c4d523f1.js.map | 1 - frontend/src/views/common/Header.vue | 2 +- 19 files changed, 83 insertions(+), 139 deletions(-) delete mode 100644 dist/static/css/app.040e9964d8ea2489efcdcc40708e43f8.css delete mode 100644 dist/static/css/app.040e9964d8ea2489efcdcc40708e43f8.css.map delete mode 100644 dist/static/css/app.2392859d9d9ca73ef90dcaf7d70771d9.css delete mode 100644 dist/static/css/app.2392859d9d9ca73ef90dcaf7d70771d9.css.map delete mode 100644 dist/static/css/app.5b8cadb1c68ed783d588567f669ded4e.css delete mode 100644 dist/static/css/app.5b8cadb1c68ed783d588567f669ded4e.css.map delete mode 100644 dist/static/img/planetPoster.cd6a198.jpg delete mode 100644 dist/static/js/app.15c833a883292742bcea.js delete mode 100644 dist/static/js/app.15c833a883292742bcea.js.map delete mode 100644 dist/static/js/app.879aaf457c431ea53788.js delete mode 100644 dist/static/js/app.879aaf457c431ea53788.js.map delete mode 100644 dist/static/js/app.f83b0cd33cf14451fb0d.js delete mode 100644 dist/static/js/app.f83b0cd33cf14451fb0d.js.map delete mode 100644 dist/static/js/vendor.561d4f5b1644c4d523f1.js delete mode 100644 dist/static/js/vendor.561d4f5b1644c4d523f1.js.map diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 4b25b94..7114acc 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,27 +1,27 @@ - - - - - - - - - - - - + + - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -175,6 +180,12 @@ + + + + + + @@ -271,20 +282,28 @@