feat: 合并冲突

08f6a66f · 盖献康 · 58bf6dfe · 08f6a66f · 08f6a66f · 08f6a66f
Commit 08f6a66f authored Feb 29, 2024 by 盖献康
23 changed files
--- a/.editorconfig
+++ b/.editorconfig
--- a/babel.config copy.js
+++ b/babel.config copy.js
--- a/babel.config.js
+++ b/babel.config.js
--- a/bin/package.bat
+++ b/bin/package.bat
--- a/bin/run-web.bat
+++ b/bin/run-web.bat
--- a/build/index.js
+++ b/build/index.js
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/html/ie.html
+++ b/public/html/ie.html
--- a/public/robots.txt
+++ b/public/robots.txt
--- a/src/assets/401_images/401.gif
+++ b/src/assets/401_images/401.gif
--- a/src/assets/404_images/404.png
+++ b/src/assets/404_images/404.png
--- a/src/assets/404_images/404_cloud.png
+++ b/src/assets/404_images/404_cloud.png
--- a/src/assets/images/light.svg
+++ b/src/assets/images/light.svg
--- a/src/assets/images/login-background.jpg
+++ b/src/assets/images/login-background.jpg
--- a/src/assets/images/pay.png
+++ b/src/assets/images/pay.png
--- a/src/assets/images/profile.jpg
+++ b/src/assets/images/profile.jpg
--- a/src/assets/images/questionnaire/shencharenshu.png
+++ b/src/assets/images/questionnaire/shencharenshu.png
--- a/src/assets/images/questionnaire/shibailv.png
+++ b/src/assets/images/questionnaire/shibailv.png
--- a/src/assets/images/questionnaire/sign1.png
+++ b/src/assets/images/questionnaire/sign1.png
--- a/src/assets/images/questionnaire/sign2.png
+++ b/src/assets/images/questionnaire/sign2.png
--- a/src/assets/images/questionnaire/tongguolv.png
+++ b/src/assets/images/questionnaire/tongguolv.png
--- a/src/assets/images/questionnaire/xizeshu.png
+++ b/src/assets/images/questionnaire/xizeshu.png
--- a/src/assets/logo/logo.png
+++ b/src/assets/logo/logo.png