test

64fda3d1 · chengye · 3cb00b95 · 64fda3d1 · 3cb00b95 · 3cb00b95
--- a/.gitignore
+++ b/.gitignore
@@ -14,16 +14,12 @@
 /config/database.php
 /config/cache.php
 /config/session.php
-<<<<<<< HEAD
 /config/admin.php
-=======
 /config/cookie.php
-/config/jz.php
->>>>>>> test
 /public/dist
 /public/dist2
 /public/static/uploads
 /public/static/xadmin
+/public/page
 /application/admin/view/staff/role.html
-/config/jz.php
-/config/cookie.php
+/config/jz.php
\ No newline at end of file
--- a/public/page1/css/app.7ad51aae.css
+++ b/public/page1/css/app.7ad51aae.css
--- a/public/page1/css/app.f5cc36b7.css
+++ b/public/page1/css/app.f5cc36b7.css
--- a/public/page1/css/chunk-vendors.b27c2f9a.css
+++ b/public/page1/css/chunk-vendors.b27c2f9a.css
--- a/public/page1/favicon.ico
+++ b/public/page1/favicon.ico
--- a/public/page1/fonts/bpmn.499c9aa3.eot
+++ b/public/page1/fonts/bpmn.499c9aa3.eot
--- a/public/page1/fonts/bpmn.9b84e8c8.ttf
+++ b/public/page1/fonts/bpmn.9b84e8c8.ttf
--- a/public/page1/fonts/bpmn.b5d0cc49.woff
+++ b/public/page1/fonts/bpmn.b5d0cc49.woff
--- a/public/page1/fonts/bpmn.f3d4b5d1.woff2
+++ b/public/page1/fonts/bpmn.f3d4b5d1.woff2
--- a/public/page1/fonts/element-icons.535877f5.woff
+++ b/public/page1/fonts/element-icons.535877f5.woff
--- a/public/page1/fonts/element-icons.732389de.ttf
+++ b/public/page1/fonts/element-icons.732389de.ttf
--- a/public/page1/fonts/iconfont.0208023e.0208023e.eot
+++ b/public/page1/fonts/iconfont.0208023e.0208023e.eot
--- a/public/page1/fonts/iconfont.d8583a84.d8583a84.ttf
+++ b/public/page1/fonts/iconfont.d8583a84.d8583a84.ttf
--- a/public/page1/fonts/iconfont.e9caaa06.e9caaa06.woff
+++ b/public/page1/fonts/iconfont.e9caaa06.e9caaa06.woff
--- a/public/page1/img/bpmn.deea5c90.svg
+++ b/public/page1/img/bpmn.deea5c90.svg
--- a/public/page1/img/icon-ext.ba81b24c.ba81b24c.png
+++ b/public/page1/img/icon-ext.ba81b24c.ba81b24c.png
--- a/public/page1/img/icon.551539f8.551539f8.png
+++ b/public/page1/img/icon.551539f8.551539f8.png
--- a/public/page1/img/iconfont.5d06b488.5d06b488.svg
+++ b/public/page1/img/iconfont.5d06b488.5d06b488.svg
--- a/public/page1/img/loading-0.a72011cc.a72011cc.gif
+++ b/public/page1/img/loading-0.a72011cc.a72011cc.gif
--- a/public/page1/index.html
+++ b/public/page1/index.html
--- a/public/page1/js/app.aa6907c3.js
+++ b/public/page1/js/app.aa6907c3.js
--- a/public/page1/js/app.aa6907c3.js.LICENSE
+++ b/public/page1/js/app.aa6907c3.js.LICENSE
--- a/public/page1/js/app.bc5c248b.js
+++ b/public/page1/js/app.bc5c248b.js
--- a/public/page1/js/chunk-vendors.a06d51ef.js
+++ b/public/page1/js/chunk-vendors.a06d51ef.js