diff --git a/.idea/1807c_git.iml b/.idea/1807c_git.iml
deleted file mode 100644
index bece644e64054de4c8cf99ebc81dc36ad0854cce..0000000000000000000000000000000000000000
--- a/.idea/1807c_git.iml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
-
-=======
-
-
->>>>>>> ning
-
-
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 6ebb94f1df6d933cc600b95370f24954e07bf5b6..0000000000000000000000000000000000000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 6af3c15b6c140695a551cd00c0b061450dc55f90..0000000000000000000000000000000000000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-<<<<<<< HEAD
-
-=======
-
->>>>>>> ning
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index b9796d491af2d6424856f8d1c1276353a05023d5..0000000000000000000000000000000000000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7f4cb416c083d265558da75d457237d671..0000000000000000000000000000000000000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 432ef427eff1f05164ca58bc5f072b574ed4bcfc..0000000000000000000000000000000000000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,386 +0,0 @@
-
-
-<<<<<<< HEAD
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- zhangwenting
-
-
-
-
-
-
-
-
-
-
-
- true
- DEFINITION_ORDER
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-=======
-
-
-
-
-
-
-
-
-
-
->>>>>>> ning
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<<<<<<< HEAD
-
-
-
-
-
-
-
-
- 1565923236512
-
-
- 1565923236512
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-=======
-
-
-
->>>>>>> ning
-
\ No newline at end of file
diff --git a/caojupeng/__init__.py b/caojupeng/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/caojupeng/__pycache__/__init__.cpython-36.pyc b/caojupeng/__pycache__/__init__.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..50d62dbabc3ad2d00ad903559322016cbdde9d43
Binary files /dev/null and b/caojupeng/__pycache__/__init__.cpython-36.pyc differ
diff --git a/caojupeng/__pycache__/admin.cpython-36.pyc b/caojupeng/__pycache__/admin.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..569def75760bf4592b58dbc7e0dcd4595df9041b
Binary files /dev/null and b/caojupeng/__pycache__/admin.cpython-36.pyc differ
diff --git a/caojupeng/__pycache__/models.cpython-36.pyc b/caojupeng/__pycache__/models.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..7373a60230c1f2c0bf5aacbc84fde58daa8761b3
Binary files /dev/null and b/caojupeng/__pycache__/models.cpython-36.pyc differ
diff --git a/caojupeng/__pycache__/urls.cpython-36.pyc b/caojupeng/__pycache__/urls.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..436c2309b5fb99e2b2842b3cefa28ab9bd5941ae
Binary files /dev/null and b/caojupeng/__pycache__/urls.cpython-36.pyc differ
diff --git a/caojupeng/__pycache__/views.cpython-36.pyc b/caojupeng/__pycache__/views.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..a38115f501a4075ec3ff3b9d2d8a1f3a713be952
Binary files /dev/null and b/caojupeng/__pycache__/views.cpython-36.pyc differ
diff --git a/caojupeng/admin.py b/caojupeng/admin.py
new file mode 100644
index 0000000000000000000000000000000000000000..8c38f3f3dad51e4585f3984282c2a4bec5349c1e
--- /dev/null
+++ b/caojupeng/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/caojupeng/apps.py b/caojupeng/apps.py
new file mode 100644
index 0000000000000000000000000000000000000000..a6da15bbc04424a8169f2da08a75ea67a9e7d20e
--- /dev/null
+++ b/caojupeng/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class CaojupengConfig(AppConfig):
+ name = 'caojupeng'
diff --git a/caojupeng/migrations/__init__.py b/caojupeng/migrations/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/caojupeng/migrations/__pycache__/__init__.cpython-36.pyc b/caojupeng/migrations/__pycache__/__init__.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..dd2c6198678b580dbe49bb8e6bc4b948fe863d10
Binary files /dev/null and b/caojupeng/migrations/__pycache__/__init__.cpython-36.pyc differ
diff --git a/caojupeng/models.py b/caojupeng/models.py
new file mode 100644
index 0000000000000000000000000000000000000000..71a836239075aa6e6e4ecb700e9c42c95c022d91
--- /dev/null
+++ b/caojupeng/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/caojupeng/tests.py b/caojupeng/tests.py
new file mode 100644
index 0000000000000000000000000000000000000000..7ce503c2dd97ba78597f6ff6e4393132753573f6
--- /dev/null
+++ b/caojupeng/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/caojupeng/urls.py b/caojupeng/urls.py
new file mode 100644
index 0000000000000000000000000000000000000000..139c94b819413d0bc936f918ab7f524547ecc806
--- /dev/null
+++ b/caojupeng/urls.py
@@ -0,0 +1,9 @@
+from django.urls import path
+from caojupeng import views
+
+app_name = 'caojupeng'
+urlpatterns = [
+
+ path('caojupeng/',views.caojupeng,name='caojupeng')
+
+]
\ No newline at end of file
diff --git a/caojupeng/views.py b/caojupeng/views.py
new file mode 100644
index 0000000000000000000000000000000000000000..9f852c2fa4300afd2aa21b66717aaaa6a1417c71
--- /dev/null
+++ b/caojupeng/views.py
@@ -0,0 +1,5 @@
+from django.shortcuts import render
+
+# Create your views here.
+def caojupeng(request):
+ return render(request,'caojupeng.html')
\ No newline at end of file
diff --git a/chenghao/__pycache__/__init__.cpython-36.pyc b/chenghao/__pycache__/__init__.cpython-36.pyc
index e64cf60ee7164f3b3d48ebd63f83845437cb8054..8445491ff6f7a46812c14e3a0f1017a94b888f85 100644
Binary files a/chenghao/__pycache__/__init__.cpython-36.pyc and b/chenghao/__pycache__/__init__.cpython-36.pyc differ
diff --git a/chenghao/__pycache__/admin.cpython-36.pyc b/chenghao/__pycache__/admin.cpython-36.pyc
index 97e2455891b3aad9c5e37c1a5a01eb392649e041..875dfac60f02859829ffbcd313006550484478ee 100644
Binary files a/chenghao/__pycache__/admin.cpython-36.pyc and b/chenghao/__pycache__/admin.cpython-36.pyc differ
diff --git a/chenghao/__pycache__/models.cpython-36.pyc b/chenghao/__pycache__/models.cpython-36.pyc
index ee404136ec2a3dc0b01c13ee40aad8296399d27a..0ec6f7bb5e1e07d2935dd3be0d43c14c7677d5ec 100644
Binary files a/chenghao/__pycache__/models.cpython-36.pyc and b/chenghao/__pycache__/models.cpython-36.pyc differ
diff --git a/chenghao/__pycache__/urls.cpython-36.pyc b/chenghao/__pycache__/urls.cpython-36.pyc
index 97fc260e4e817c8edaedfa8bf74f57d4986a22a7..208d55bdf8b81762db6ec88614bc4338764d460f 100644
Binary files a/chenghao/__pycache__/urls.cpython-36.pyc and b/chenghao/__pycache__/urls.cpython-36.pyc differ
diff --git a/chenghao/__pycache__/views.cpython-36.pyc b/chenghao/__pycache__/views.cpython-36.pyc
index 56215c86fb13fb6517102a86dcff873fb385cf7b..91549a81b87cc28c6d4a6157637d17fd07fab452 100644
Binary files a/chenghao/__pycache__/views.cpython-36.pyc and b/chenghao/__pycache__/views.cpython-36.pyc differ
diff --git a/chenghao/migrations/__pycache__/__init__.cpython-36.pyc b/chenghao/migrations/__pycache__/__init__.cpython-36.pyc
index 67db6988fca5922070527136e383109f395d656f..24ca35d175ceb71bc1b74b3fe72e641dee77bd67 100644
Binary files a/chenghao/migrations/__pycache__/__init__.cpython-36.pyc and b/chenghao/migrations/__pycache__/__init__.cpython-36.pyc differ
diff --git a/dusen/__pycache__/__init__.cpython-36.pyc b/dusen/__pycache__/__init__.cpython-36.pyc
index e47837cd57c0461ff632cc4624183f81c42d1591..b90488d8649fb74d1f1383a06d12675c78bd5abc 100644
Binary files a/dusen/__pycache__/__init__.cpython-36.pyc and b/dusen/__pycache__/__init__.cpython-36.pyc differ
diff --git a/dusen/__pycache__/admin.cpython-36.pyc b/dusen/__pycache__/admin.cpython-36.pyc
index 24a3a31fd936d6fcb379432bff6b74fe310db57a..f4366e71bb0a2ccf7df56a44433fd37c478bd0bc 100644
Binary files a/dusen/__pycache__/admin.cpython-36.pyc and b/dusen/__pycache__/admin.cpython-36.pyc differ
diff --git a/dusen/__pycache__/models.cpython-36.pyc b/dusen/__pycache__/models.cpython-36.pyc
index 55b8a1041bf6e57989d9c27a84f2edea7d3f18d6..4169ad68442d6ece8d7bc4c278bb1677b9565a6d 100644
Binary files a/dusen/__pycache__/models.cpython-36.pyc and b/dusen/__pycache__/models.cpython-36.pyc differ
diff --git a/dusen/__pycache__/urls.cpython-36.pyc b/dusen/__pycache__/urls.cpython-36.pyc
index 0cbe11961526d98bb201d69f5cd5f8d9c2e68886..0c1fb4fdfa28fa14e27c1413541fcee88aed0c43 100644
Binary files a/dusen/__pycache__/urls.cpython-36.pyc and b/dusen/__pycache__/urls.cpython-36.pyc differ
diff --git a/dusen/__pycache__/views.cpython-36.pyc b/dusen/__pycache__/views.cpython-36.pyc
index a46e2f2679380c7562dce45768b9c6840ad7eb02..241b78106ee460b5c2308f135e93817c4f42dd9f 100644
Binary files a/dusen/__pycache__/views.cpython-36.pyc and b/dusen/__pycache__/views.cpython-36.pyc differ
diff --git a/fxy/__pycache__/__init__.cpython-36.pyc b/fxy/__pycache__/__init__.cpython-36.pyc
index 65fdc434d0bf68bdb178ac5241ada15e56895c79..512692ad3781c4b4fc73fdd364c6dc2a95d0fe57 100644
Binary files a/fxy/__pycache__/__init__.cpython-36.pyc and b/fxy/__pycache__/__init__.cpython-36.pyc differ
diff --git a/fxy/__pycache__/admin.cpython-36.pyc b/fxy/__pycache__/admin.cpython-36.pyc
index 7846de1f95458fd8cfcfa64249f5ec3403024e79..36f33e318017456b992a730497666566fb3c7e4b 100644
Binary files a/fxy/__pycache__/admin.cpython-36.pyc and b/fxy/__pycache__/admin.cpython-36.pyc differ
diff --git a/fxy/__pycache__/models.cpython-36.pyc b/fxy/__pycache__/models.cpython-36.pyc
index cdd2dbe844bcebc50ef28519aee2a650e17f49a2..33437bd088dbd0c1a338f69bec0c45105be08dd4 100644
Binary files a/fxy/__pycache__/models.cpython-36.pyc and b/fxy/__pycache__/models.cpython-36.pyc differ
diff --git a/fxy/__pycache__/urls.cpython-36.pyc b/fxy/__pycache__/urls.cpython-36.pyc
index c64e174a9ba7a4129148d4ced2b8ee690fbee223..141827f245e15c595eff627849064ccde1d0202c 100644
Binary files a/fxy/__pycache__/urls.cpython-36.pyc and b/fxy/__pycache__/urls.cpython-36.pyc differ
diff --git a/fxy/__pycache__/views.cpython-36.pyc b/fxy/__pycache__/views.cpython-36.pyc
index 2d3c708166a6933c7b98efef3be887c4569cddc0..51b5e151fc63823860018b9728373e4cef1209bc 100644
Binary files a/fxy/__pycache__/views.cpython-36.pyc and b/fxy/__pycache__/views.cpython-36.pyc differ
diff --git a/git_cs/__pycache__/__init__.cpython-36.pyc b/git_cs/__pycache__/__init__.cpython-36.pyc
index 4593fbf6f9fa2966328b965e276048cfe7fa672c..f9c331dbe40fd03d5e52ce72c082b91671104b3c 100644
Binary files a/git_cs/__pycache__/__init__.cpython-36.pyc and b/git_cs/__pycache__/__init__.cpython-36.pyc differ
diff --git a/git_cs/__pycache__/settings.cpython-36.pyc b/git_cs/__pycache__/settings.cpython-36.pyc
index cbcf6979a799bdb442f8ba4e7ab2ca165dc4ab66..4a3b2486f4c029cb972a16793220a9f6ecf847f8 100644
Binary files a/git_cs/__pycache__/settings.cpython-36.pyc and b/git_cs/__pycache__/settings.cpython-36.pyc differ
diff --git a/git_cs/__pycache__/urls.cpython-36.pyc b/git_cs/__pycache__/urls.cpython-36.pyc
index cd2e1283bdf94d953f930a9fbc170305ef4acb54..f47cbe26a743a2ce7dcc95b5ca464b7847b84cd7 100644
Binary files a/git_cs/__pycache__/urls.cpython-36.pyc and b/git_cs/__pycache__/urls.cpython-36.pyc differ
diff --git a/git_cs/__pycache__/wsgi.cpython-36.pyc b/git_cs/__pycache__/wsgi.cpython-36.pyc
index a77e0c457d4d8b3f7ef692ab89180b326631c30b..d44dfbff8a817c44048826843b780ef2ec05f633 100644
Binary files a/git_cs/__pycache__/wsgi.cpython-36.pyc and b/git_cs/__pycache__/wsgi.cpython-36.pyc differ
diff --git a/git_cs/settings.py b/git_cs/settings.py
index 925ccf137e92c47a0b6cec994736c1e1c61af9bb..bb8f21115f12a1ebea65ff36143c2d6b30c77db8 100644
--- a/git_cs/settings.py
+++ b/git_cs/settings.py
@@ -40,7 +40,7 @@ INSTALLED_APPS = [
'django.contrib.staticfiles',
-<<<<<<< HEAD
+
# 'huoyanan',
@@ -91,10 +91,11 @@ INSTALLED_APPS = [
'zhanyashuai',
'zhangwenting',
+ 'caojupeng',
+
+
+ 'ning',
-=======
- 'ning'
->>>>>>> ning
]
MIDDLEWARE = [
diff --git a/git_cs/urls.py b/git_cs/urls.py
index 2583e298ca1f84a7db15e3e86f52e65d9493f9a2..0079cbfe7ac2c29a748eb04c2ad4fb0fb81ee0ec 100644
--- a/git_cs/urls.py
+++ b/git_cs/urls.py
@@ -20,7 +20,7 @@ urlpatterns = [
path('lishan',include('lishan.urls')),
path('',TemplateView.as_view(template_name='index.html')),
-<<<<<<< HEAD
+
path('huoyanan/',include('huoyanan.urls')),
@@ -121,8 +121,9 @@ urlpatterns = [
path('laofan/',include('laofan.urls')),
path('zhangyashuai/',include('zhanyashuai.urls')),
+ path('caojupeng/',include('caojupeng.urls')),
+
+
+ path('ningchengfu/',include('ning.urls')),
-=======
- path('ningchengfu/',include('ning.urls'))
->>>>>>> ning
]
diff --git a/guanliang/__pycache__/__init__.cpython-36.pyc b/guanliang/__pycache__/__init__.cpython-36.pyc
index ec771c71450909e4fa93f5d1798f9204d0265c49..facbfd5a54bc590b286c503ca453fa707cb2940d 100644
Binary files a/guanliang/__pycache__/__init__.cpython-36.pyc and b/guanliang/__pycache__/__init__.cpython-36.pyc differ
diff --git a/guanliang/__pycache__/admin.cpython-36.pyc b/guanliang/__pycache__/admin.cpython-36.pyc
index f868c447f44e43ee340f392b3b1f4a61f7885d9b..6722bd537fc18630ac54d2b97ced0d26108dfc83 100644
Binary files a/guanliang/__pycache__/admin.cpython-36.pyc and b/guanliang/__pycache__/admin.cpython-36.pyc differ
diff --git a/guanliang/__pycache__/models.cpython-36.pyc b/guanliang/__pycache__/models.cpython-36.pyc
index 456a95d8b27a4a64ecf88033d6aeff3b1fe9bf26..5997d5328e1c75276f48985a25749da107369608 100644
Binary files a/guanliang/__pycache__/models.cpython-36.pyc and b/guanliang/__pycache__/models.cpython-36.pyc differ
diff --git a/guanliang/__pycache__/urls.cpython-36.pyc b/guanliang/__pycache__/urls.cpython-36.pyc
index f63a163aed4e1f45ae8abbc5a7a5a47d49450f39..37c4ff8bafb8f41940c5610fbac1f48a26de7c7c 100644
Binary files a/guanliang/__pycache__/urls.cpython-36.pyc and b/guanliang/__pycache__/urls.cpython-36.pyc differ
diff --git a/guanliang/__pycache__/views.cpython-36.pyc b/guanliang/__pycache__/views.cpython-36.pyc
index 752bd70e910b7e5d75dd0127de6faaed6556103d..55faaa4c688f0eecd2ce175c0ef833d073bbd701 100644
Binary files a/guanliang/__pycache__/views.cpython-36.pyc and b/guanliang/__pycache__/views.cpython-36.pyc differ
diff --git a/guohongyi/__pycache__/__init__.cpython-36.pyc b/guohongyi/__pycache__/__init__.cpython-36.pyc
index c60a8d643025fee147080eab0e25597102b2d7f7..c17feff46edfad9edc601e3a967d4673462222e7 100644
Binary files a/guohongyi/__pycache__/__init__.cpython-36.pyc and b/guohongyi/__pycache__/__init__.cpython-36.pyc differ
diff --git a/guohongyi/__pycache__/admin.cpython-36.pyc b/guohongyi/__pycache__/admin.cpython-36.pyc
index 7b590c95f1b595e0d9267b8a6ab1a86aaba5c338..1b21b3cd6e05de90cc16a962481d94d178b40dee 100644
Binary files a/guohongyi/__pycache__/admin.cpython-36.pyc and b/guohongyi/__pycache__/admin.cpython-36.pyc differ
diff --git a/guohongyi/__pycache__/models.cpython-36.pyc b/guohongyi/__pycache__/models.cpython-36.pyc
index 9762a106e06ea4cb7d628cd1b29fd9679f09fc00..a6794be2011000f81daa1cb9d3da28d3aff118ef 100644
Binary files a/guohongyi/__pycache__/models.cpython-36.pyc and b/guohongyi/__pycache__/models.cpython-36.pyc differ
diff --git a/guohongyi/__pycache__/urls.cpython-36.pyc b/guohongyi/__pycache__/urls.cpython-36.pyc
index 5aa85c0a733b2e8f342e575a9b44b20b59c6d004..2eb7a90a772ebb2e49f8b5be6632007e8b681fdc 100644
Binary files a/guohongyi/__pycache__/urls.cpython-36.pyc and b/guohongyi/__pycache__/urls.cpython-36.pyc differ
diff --git a/guohongyi/__pycache__/views.cpython-36.pyc b/guohongyi/__pycache__/views.cpython-36.pyc
index 65a5beab0e54f723bcaf285f6255460a13742e4f..5d6b37b982c25306fc17e2ed336d1436622197d7 100644
Binary files a/guohongyi/__pycache__/views.cpython-36.pyc and b/guohongyi/__pycache__/views.cpython-36.pyc differ
diff --git a/guohongyi/migrations/__pycache__/__init__.cpython-36.pyc b/guohongyi/migrations/__pycache__/__init__.cpython-36.pyc
index c38e3dcadbe17c12a168ba19e4e020b2e50181c4..41b7540a84ebfcc17ac0015902e65c3474f155b5 100644
Binary files a/guohongyi/migrations/__pycache__/__init__.cpython-36.pyc and b/guohongyi/migrations/__pycache__/__init__.cpython-36.pyc differ
diff --git a/hbj/__pycache__/__init__.cpython-36.pyc b/hbj/__pycache__/__init__.cpython-36.pyc
index 2cea92f59cc70c026caedf33bd504b7e1f9fa3b4..6fdecec15e4d5ee526b779beaf1fee12e7663f14 100644
Binary files a/hbj/__pycache__/__init__.cpython-36.pyc and b/hbj/__pycache__/__init__.cpython-36.pyc differ
diff --git a/hbj/__pycache__/admin.cpython-36.pyc b/hbj/__pycache__/admin.cpython-36.pyc
index f92bc6ff837a5430396215363d597217a277739c..a671c8050ea851f72ca0ca416155789131e21b0a 100644
Binary files a/hbj/__pycache__/admin.cpython-36.pyc and b/hbj/__pycache__/admin.cpython-36.pyc differ
diff --git a/hbj/__pycache__/models.cpython-36.pyc b/hbj/__pycache__/models.cpython-36.pyc
index 6dbaf7550b65b1c18be2a9371caa338ee07322b0..11848595c2c1b62f0931d27700f3be0e546974bc 100644
Binary files a/hbj/__pycache__/models.cpython-36.pyc and b/hbj/__pycache__/models.cpython-36.pyc differ
diff --git a/hbj/__pycache__/urls.cpython-36.pyc b/hbj/__pycache__/urls.cpython-36.pyc
index 36caebb2dcef4d2506d9b3b472f09a884d99eed0..cdc525f51c0f68552aed2205d647d8f90f054158 100644
Binary files a/hbj/__pycache__/urls.cpython-36.pyc and b/hbj/__pycache__/urls.cpython-36.pyc differ
diff --git a/hbj/__pycache__/views.cpython-36.pyc b/hbj/__pycache__/views.cpython-36.pyc
index b876321d9066c84e0d4220098d26d14f4672e336..4b02d47dfddd0cbd891c744e772f1427bfe16c22 100644
Binary files a/hbj/__pycache__/views.cpython-36.pyc and b/hbj/__pycache__/views.cpython-36.pyc differ
diff --git a/houjunjie/__pycache__/__init__.cpython-36.pyc b/houjunjie/__pycache__/__init__.cpython-36.pyc
index f1e22f1f0b62e736c6bd55a5fd721ee7b6f1ed33..46ba77f066e133d7f71457d9d06ac66172b9b2bd 100644
Binary files a/houjunjie/__pycache__/__init__.cpython-36.pyc and b/houjunjie/__pycache__/__init__.cpython-36.pyc differ
diff --git a/houjunjie/__pycache__/admin.cpython-36.pyc b/houjunjie/__pycache__/admin.cpython-36.pyc
index ee9767b4bc22702e61811e3a9c49f3025e1441c1..5da323d114a9898a508aefff85988c4f5faffa33 100644
Binary files a/houjunjie/__pycache__/admin.cpython-36.pyc and b/houjunjie/__pycache__/admin.cpython-36.pyc differ
diff --git a/houjunjie/__pycache__/models.cpython-36.pyc b/houjunjie/__pycache__/models.cpython-36.pyc
index 68238f768dcb75549bda3382b7656f234c7a7817..8d898061bc7fe8357ab67d3b7ffdfb3290b9c664 100644
Binary files a/houjunjie/__pycache__/models.cpython-36.pyc and b/houjunjie/__pycache__/models.cpython-36.pyc differ
diff --git a/houjunjie/__pycache__/urls.cpython-36.pyc b/houjunjie/__pycache__/urls.cpython-36.pyc
index 1ba63f28360050bc78dc5e807ea1fc41e17de82e..6d988e7bde61fdf385076467e421b87405d06f7f 100644
Binary files a/houjunjie/__pycache__/urls.cpython-36.pyc and b/houjunjie/__pycache__/urls.cpython-36.pyc differ
diff --git a/houjunjie/__pycache__/views.cpython-36.pyc b/houjunjie/__pycache__/views.cpython-36.pyc
index eb880bc94791891d52e0021b018add73b262bd27..c5ed0ebe3920c5fc901a70d6c18729a399831fa9 100644
Binary files a/houjunjie/__pycache__/views.cpython-36.pyc and b/houjunjie/__pycache__/views.cpython-36.pyc differ
diff --git a/houxiaodong/__pycache__/__init__.cpython-36.pyc b/houxiaodong/__pycache__/__init__.cpython-36.pyc
index e374fa03b798d4ddee9e0e5a80ec44e6f864c580..40f737141c86b1fe18f998cdf596162d266e0106 100644
Binary files a/houxiaodong/__pycache__/__init__.cpython-36.pyc and b/houxiaodong/__pycache__/__init__.cpython-36.pyc differ
diff --git a/houxiaodong/__pycache__/admin.cpython-36.pyc b/houxiaodong/__pycache__/admin.cpython-36.pyc
index fb8a8e4b1101b30059780010d176ed351d8995b5..238e76eedf8c0cc37ebe2c2c7cde3ee462bc285b 100644
Binary files a/houxiaodong/__pycache__/admin.cpython-36.pyc and b/houxiaodong/__pycache__/admin.cpython-36.pyc differ
diff --git a/houxiaodong/__pycache__/models.cpython-36.pyc b/houxiaodong/__pycache__/models.cpython-36.pyc
index 7d24e9ec678c8aa7404536f05d97fe4c6af067db..f3100308bd61ed4288698bcea612f4cfbb3aac55 100644
Binary files a/houxiaodong/__pycache__/models.cpython-36.pyc and b/houxiaodong/__pycache__/models.cpython-36.pyc differ
diff --git a/houxiaodong/__pycache__/urls.cpython-36.pyc b/houxiaodong/__pycache__/urls.cpython-36.pyc
index 82b0add31071de7e28af0f7813bc61f3d103e538..8f0c20483157a32f4a90bf3d3a6f9d57e370f7dd 100644
Binary files a/houxiaodong/__pycache__/urls.cpython-36.pyc and b/houxiaodong/__pycache__/urls.cpython-36.pyc differ
diff --git a/houxiaodong/__pycache__/views.cpython-36.pyc b/houxiaodong/__pycache__/views.cpython-36.pyc
index eba677ebdbf38d5ce3f4dcbccef7fdb5b56b0501..c54eebdfa7b79fd91ba17121f92ab2b085b005d0 100644
Binary files a/houxiaodong/__pycache__/views.cpython-36.pyc and b/houxiaodong/__pycache__/views.cpython-36.pyc differ
diff --git a/huoyanan/__pycache__/__init__.cpython-36.pyc b/huoyanan/__pycache__/__init__.cpython-36.pyc
index 7d41eaf260dfd43969c52cdec943eff5ad843407..7fbc3b761801ac4fafb62e0448404f81c1e7c0c0 100644
Binary files a/huoyanan/__pycache__/__init__.cpython-36.pyc and b/huoyanan/__pycache__/__init__.cpython-36.pyc differ
diff --git a/huoyanan/__pycache__/admin.cpython-36.pyc b/huoyanan/__pycache__/admin.cpython-36.pyc
index b05cd5bf0d7f89d0af70834360c7a7201db9a2da..58c87d2b4d97a7d029816b541f355f09c7c75f06 100644
Binary files a/huoyanan/__pycache__/admin.cpython-36.pyc and b/huoyanan/__pycache__/admin.cpython-36.pyc differ
diff --git a/huoyanan/__pycache__/models.cpython-36.pyc b/huoyanan/__pycache__/models.cpython-36.pyc
index e905dc258fa9f5a2b484108c25a16efc6632ae78..75fec52c1652a8d3dfc06045b63789ba9fe846d3 100644
Binary files a/huoyanan/__pycache__/models.cpython-36.pyc and b/huoyanan/__pycache__/models.cpython-36.pyc differ
diff --git a/huoyanan/__pycache__/urls.cpython-36.pyc b/huoyanan/__pycache__/urls.cpython-36.pyc
index 3f68a4369fd90eb6b7ffd1faa4b039e72ea30106..b106b4dfec606691eeb95d7d664891ab9f686fe0 100644
Binary files a/huoyanan/__pycache__/urls.cpython-36.pyc and b/huoyanan/__pycache__/urls.cpython-36.pyc differ
diff --git a/huoyanan/__pycache__/views.cpython-36.pyc b/huoyanan/__pycache__/views.cpython-36.pyc
index f19b09024c063f87b73f299e175e9f5acfa26d8d..0311e07a2a1a9fd0b5836ba7246df32a4b10454d 100644
Binary files a/huoyanan/__pycache__/views.cpython-36.pyc and b/huoyanan/__pycache__/views.cpython-36.pyc differ
diff --git a/huoyanan/migrations/__pycache__/__init__.cpython-36.pyc b/huoyanan/migrations/__pycache__/__init__.cpython-36.pyc
index ecd07c29362f5f784426ee359f7fd635072d4413..f32cf70aab5fa567d92bb822f3d8399af6eda74e 100644
Binary files a/huoyanan/migrations/__pycache__/__init__.cpython-36.pyc and b/huoyanan/migrations/__pycache__/__init__.cpython-36.pyc differ
diff --git a/klq/__pycache__/__init__.cpython-36.pyc b/klq/__pycache__/__init__.cpython-36.pyc
index 6d122ee602f445606cabb220167574631bacd8a2..cbb71a6556819c050e8fec11212a79dcbadf160b 100644
Binary files a/klq/__pycache__/__init__.cpython-36.pyc and b/klq/__pycache__/__init__.cpython-36.pyc differ
diff --git a/klq/__pycache__/admin.cpython-36.pyc b/klq/__pycache__/admin.cpython-36.pyc
index 30f45486d72923e94fdea6b8646160229a1de0ab..b0a4ffc178c7e72e270a56df9d18d213ea4a12fc 100644
Binary files a/klq/__pycache__/admin.cpython-36.pyc and b/klq/__pycache__/admin.cpython-36.pyc differ
diff --git a/klq/__pycache__/models.cpython-36.pyc b/klq/__pycache__/models.cpython-36.pyc
index 30fd604430d68ee95469cef3926acff9b8049878..bdd9b4fedfeb9681477737c982e17ab4f0148bcf 100644
Binary files a/klq/__pycache__/models.cpython-36.pyc and b/klq/__pycache__/models.cpython-36.pyc differ
diff --git a/klq/__pycache__/urls.cpython-36.pyc b/klq/__pycache__/urls.cpython-36.pyc
index 60d692f933fcda033a31299269901946f9c60901..b4e9e890f0b09da2372a3c37abde5c0e17bc09f5 100644
Binary files a/klq/__pycache__/urls.cpython-36.pyc and b/klq/__pycache__/urls.cpython-36.pyc differ
diff --git a/klq/__pycache__/views.cpython-36.pyc b/klq/__pycache__/views.cpython-36.pyc
index 5b9a6d3889a41d3bf817d50d136e5f51e1ef23eb..7d190f6089c659012c9f3e8a8a6ebfb34ebc69bc 100644
Binary files a/klq/__pycache__/views.cpython-36.pyc and b/klq/__pycache__/views.cpython-36.pyc differ
diff --git a/laofan/__pycache__/__init__.cpython-36.pyc b/laofan/__pycache__/__init__.cpython-36.pyc
index 4e5ae419587e2b842a804efb8543c08b09cfa909..425666aa2e25569a12f783e710c412db14f4f718 100644
Binary files a/laofan/__pycache__/__init__.cpython-36.pyc and b/laofan/__pycache__/__init__.cpython-36.pyc differ
diff --git a/laofan/__pycache__/admin.cpython-36.pyc b/laofan/__pycache__/admin.cpython-36.pyc
index 890c859488b5ec6c42b842a5002bf2f3cd07c247..8aa448bff4b4930762dc941bd53616ad7a87e011 100644
Binary files a/laofan/__pycache__/admin.cpython-36.pyc and b/laofan/__pycache__/admin.cpython-36.pyc differ
diff --git a/laofan/__pycache__/models.cpython-36.pyc b/laofan/__pycache__/models.cpython-36.pyc
index 2d5666a40db3c373707de97b5614f5d818be5ad7..b236c6e097735d7a0ac6dbe390dae7a54d40534b 100644
Binary files a/laofan/__pycache__/models.cpython-36.pyc and b/laofan/__pycache__/models.cpython-36.pyc differ
diff --git a/laofan/__pycache__/urls.cpython-36.pyc b/laofan/__pycache__/urls.cpython-36.pyc
index 7371f241ffa04421d33ceeeb29edaab06be84966..b3170929255121f1b3082d924497967e0d12fb02 100644
Binary files a/laofan/__pycache__/urls.cpython-36.pyc and b/laofan/__pycache__/urls.cpython-36.pyc differ
diff --git a/laofan/__pycache__/views.cpython-36.pyc b/laofan/__pycache__/views.cpython-36.pyc
index f0b8c944cf1caa1fc5d399255645f367829b2e4c..91ed7e4ab84c9c1a9cb2bd1993dbef7250acfa5e 100644
Binary files a/laofan/__pycache__/views.cpython-36.pyc and b/laofan/__pycache__/views.cpython-36.pyc differ
diff --git a/laofan/migrations/__pycache__/__init__.cpython-36.pyc b/laofan/migrations/__pycache__/__init__.cpython-36.pyc
index e1bdb88ee4fc34be0754532eaeb8266f2c59033d..7f0685aa8544d6f50c9d1e9e6b127979c8a99342 100644
Binary files a/laofan/migrations/__pycache__/__init__.cpython-36.pyc and b/laofan/migrations/__pycache__/__init__.cpython-36.pyc differ
diff --git a/lilei/__pycache__/__init__.cpython-36.pyc b/lilei/__pycache__/__init__.cpython-36.pyc
index 3f2f4bcba798d80ae0243254f654a31232d49ee0..47f49d00f1fa36fbb4cf28fcb302ae0cfb9c46fb 100644
Binary files a/lilei/__pycache__/__init__.cpython-36.pyc and b/lilei/__pycache__/__init__.cpython-36.pyc differ
diff --git a/lilei/__pycache__/admin.cpython-36.pyc b/lilei/__pycache__/admin.cpython-36.pyc
index 44ade548a1b9920f33a5dcce97131122d15b4c15..e9a2587c567eabb6915518b4102729d4aa752a94 100644
Binary files a/lilei/__pycache__/admin.cpython-36.pyc and b/lilei/__pycache__/admin.cpython-36.pyc differ
diff --git a/lilei/__pycache__/models.cpython-36.pyc b/lilei/__pycache__/models.cpython-36.pyc
index 12d8cea0d2d57551125f92141d1461a42c7248fe..4722b9bfef2db5ef85deae0fa7ec93ad91c2cadd 100644
Binary files a/lilei/__pycache__/models.cpython-36.pyc and b/lilei/__pycache__/models.cpython-36.pyc differ
diff --git a/lilei/__pycache__/urls.cpython-36.pyc b/lilei/__pycache__/urls.cpython-36.pyc
index b0763f15b137fe868a77a69d0b73e6af201bbb47..920b11e52c6ed77874ed3bd77f4865c83e402006 100644
Binary files a/lilei/__pycache__/urls.cpython-36.pyc and b/lilei/__pycache__/urls.cpython-36.pyc differ
diff --git a/lilei/__pycache__/views.cpython-36.pyc b/lilei/__pycache__/views.cpython-36.pyc
index de5c50f7540956caaac77235c5295729d8b17075..e0d0d09dd786255a64018d47816af814a0e81b6a 100644
Binary files a/lilei/__pycache__/views.cpython-36.pyc and b/lilei/__pycache__/views.cpython-36.pyc differ
diff --git a/lishan/__pycache__/__init__.cpython-36.pyc b/lishan/__pycache__/__init__.cpython-36.pyc
index dfac816e7fcce54e3bff246f40107bc81e8d4b85..94e6d1fb08192fec55002f66f9f81735fec0b4fe 100644
Binary files a/lishan/__pycache__/__init__.cpython-36.pyc and b/lishan/__pycache__/__init__.cpython-36.pyc differ
diff --git a/lishan/__pycache__/admin.cpython-36.pyc b/lishan/__pycache__/admin.cpython-36.pyc
index 75681b68a7014b4e36d592fc07c8afeff1e3ae5b..49380bc16f29f9018b6e0f943c5eda06da094c02 100644
Binary files a/lishan/__pycache__/admin.cpython-36.pyc and b/lishan/__pycache__/admin.cpython-36.pyc differ
diff --git a/lishan/__pycache__/models.cpython-36.pyc b/lishan/__pycache__/models.cpython-36.pyc
index 8e3e92ff8a0707a530647d4d017b4dd32d269e97..ae8f45c350f03c7ad7079d873b5bb275d4bd0529 100644
Binary files a/lishan/__pycache__/models.cpython-36.pyc and b/lishan/__pycache__/models.cpython-36.pyc differ
diff --git a/lishan/__pycache__/urls.cpython-36.pyc b/lishan/__pycache__/urls.cpython-36.pyc
index 969d94fe6c235881d46f1b0a912c8e1f3d3a84f0..645359e51defc7088caf6e6b2b1119e8625cb1ab 100644
Binary files a/lishan/__pycache__/urls.cpython-36.pyc and b/lishan/__pycache__/urls.cpython-36.pyc differ
diff --git a/lishan/__pycache__/views.cpython-36.pyc b/lishan/__pycache__/views.cpython-36.pyc
index fd0f2ac2789e6dec82403829c9db88bed0a8a104..e2b9dd90d4b8e4608a1cf39c5fb0a024890f28ab 100644
Binary files a/lishan/__pycache__/views.cpython-36.pyc and b/lishan/__pycache__/views.cpython-36.pyc differ
diff --git a/liyichao/__pycache__/__init__.cpython-36.pyc b/liyichao/__pycache__/__init__.cpython-36.pyc
index 0733e7086e3ac270a611019800289914c7d9d2b2..49d360b97888d7981fb20a9d39e65639ab44fd4a 100644
Binary files a/liyichao/__pycache__/__init__.cpython-36.pyc and b/liyichao/__pycache__/__init__.cpython-36.pyc differ
diff --git a/liyichao/__pycache__/admin.cpython-36.pyc b/liyichao/__pycache__/admin.cpython-36.pyc
index b81fe05d3e4b53890c10d6cbea2fddc08f8e6d59..4df632257b275b6114b17c82d64105526aae229d 100644
Binary files a/liyichao/__pycache__/admin.cpython-36.pyc and b/liyichao/__pycache__/admin.cpython-36.pyc differ
diff --git a/liyichao/__pycache__/models.cpython-36.pyc b/liyichao/__pycache__/models.cpython-36.pyc
index 432468468921eb1d194cfa0c78082c392872597c..50493c6bd6c148e6d070a68e493dc51304e83718 100644
Binary files a/liyichao/__pycache__/models.cpython-36.pyc and b/liyichao/__pycache__/models.cpython-36.pyc differ
diff --git a/liyichao/__pycache__/urls.cpython-36.pyc b/liyichao/__pycache__/urls.cpython-36.pyc
index b8b0786906b187d3e2c241e9d7051102057d3967..fdc86534d7629de4a4fd806b5f1185816c35b0d7 100644
Binary files a/liyichao/__pycache__/urls.cpython-36.pyc and b/liyichao/__pycache__/urls.cpython-36.pyc differ
diff --git a/liyichao/__pycache__/views.cpython-36.pyc b/liyichao/__pycache__/views.cpython-36.pyc
index 17198d2d30329ec186df96f0685225ed9c6c3e3e..d948d8d6d2d6e8058099501249dcd6c278ce2ab9 100644
Binary files a/liyichao/__pycache__/views.cpython-36.pyc and b/liyichao/__pycache__/views.cpython-36.pyc differ
diff --git a/liyichao/migrations/__pycache__/__init__.cpython-36.pyc b/liyichao/migrations/__pycache__/__init__.cpython-36.pyc
index fe87efe4cec47bc1086d97bdb2c31fdd0f7789ed..32e212b919dc5555a6e338ab0bc0f3d596745266 100644
Binary files a/liyichao/migrations/__pycache__/__init__.cpython-36.pyc and b/liyichao/migrations/__pycache__/__init__.cpython-36.pyc differ
diff --git a/mazhen/__pycache__/__init__.cpython-36.pyc b/mazhen/__pycache__/__init__.cpython-36.pyc
index 2d4842d34d6cddb26d8dedcae15b4b69e02658b1..de0b21322633f7d47d3f8be43bdce396e40712df 100644
Binary files a/mazhen/__pycache__/__init__.cpython-36.pyc and b/mazhen/__pycache__/__init__.cpython-36.pyc differ
diff --git a/mazhen/__pycache__/urls.cpython-36.pyc b/mazhen/__pycache__/urls.cpython-36.pyc
index 3ff232fa50eb0e7ccbbf9b7a2ad583cb4c51613a..98c4db973f0589fd109ca7157a775b9ff2784e31 100644
Binary files a/mazhen/__pycache__/urls.cpython-36.pyc and b/mazhen/__pycache__/urls.cpython-36.pyc differ
diff --git a/mazhen/__pycache__/views.cpython-36.pyc b/mazhen/__pycache__/views.cpython-36.pyc
index 5d70abb0fe5c24bbd54280c8a97151f851e5420c..dd437cb0c635de849716d8d01c4fc318130c9943 100644
Binary files a/mazhen/__pycache__/views.cpython-36.pyc and b/mazhen/__pycache__/views.cpython-36.pyc differ
diff --git a/ning/__pycache__/__init__.cpython-36.pyc b/ning/__pycache__/__init__.cpython-36.pyc
index ba3087385eb6deaf647eba364f76ddc6a51d3574..4fd4cc3e37d665c39452a631de07a191860436bc 100644
Binary files a/ning/__pycache__/__init__.cpython-36.pyc and b/ning/__pycache__/__init__.cpython-36.pyc differ
diff --git a/ning/__pycache__/admin.cpython-36.pyc b/ning/__pycache__/admin.cpython-36.pyc
index 8ea4664df5ab4e15e3522fe21387ad178302a464..dcd12ec6eed5b245a66d6ec465dbcf07a8fa48dd 100644
Binary files a/ning/__pycache__/admin.cpython-36.pyc and b/ning/__pycache__/admin.cpython-36.pyc differ
diff --git a/ning/__pycache__/models.cpython-36.pyc b/ning/__pycache__/models.cpython-36.pyc
index a35589cffe6e0a0366cece5acb1a1ea0593f0bdc..e5c1b11222276564b8e70af9f5ec449fbd5f48c0 100644
Binary files a/ning/__pycache__/models.cpython-36.pyc and b/ning/__pycache__/models.cpython-36.pyc differ
diff --git a/ning/__pycache__/urls.cpython-36.pyc b/ning/__pycache__/urls.cpython-36.pyc
index d594cd37ee14368a6af94c4a58a011507908131a..d1c7b9c48491f13ffd753f01bfa52a902703d7bf 100644
Binary files a/ning/__pycache__/urls.cpython-36.pyc and b/ning/__pycache__/urls.cpython-36.pyc differ
diff --git a/ning/__pycache__/views.cpython-36.pyc b/ning/__pycache__/views.cpython-36.pyc
index 94c0c58a931d166eb80db88cdb81009805dc244d..5e836beceac28a57bcc78dfd7a60cb12b3657bf3 100644
Binary files a/ning/__pycache__/views.cpython-36.pyc and b/ning/__pycache__/views.cpython-36.pyc differ
diff --git a/ning/migrations/__pycache__/__init__.cpython-36.pyc b/ning/migrations/__pycache__/__init__.cpython-36.pyc
index c18d32859b718e81b74affc26a881804e2080646..19181700a5f8eb275742ea096bd5451ed96d4fae 100644
Binary files a/ning/migrations/__pycache__/__init__.cpython-36.pyc and b/ning/migrations/__pycache__/__init__.cpython-36.pyc differ
diff --git a/shijian1807/__pycache__/__init__.cpython-36.pyc b/shijian1807/__pycache__/__init__.cpython-36.pyc
index 609ef444bb2eecc72d34877dd6b16fc4d0aa9f1b..0973803a79eb2406f17549e68571b058505f084b 100644
Binary files a/shijian1807/__pycache__/__init__.cpython-36.pyc and b/shijian1807/__pycache__/__init__.cpython-36.pyc differ
diff --git a/shijian1807/__pycache__/admin.cpython-36.pyc b/shijian1807/__pycache__/admin.cpython-36.pyc
index f9098c72bc01576fb146d2d41e84226363e1b043..004f185909a43e202c4fc0f4615092365d2a111a 100644
Binary files a/shijian1807/__pycache__/admin.cpython-36.pyc and b/shijian1807/__pycache__/admin.cpython-36.pyc differ
diff --git a/shijian1807/__pycache__/models.cpython-36.pyc b/shijian1807/__pycache__/models.cpython-36.pyc
index 99fc6fc281bf3a4ab8f2c893dc0b56fa913f2813..12984a84fcb989708ed8e70ad0acecaaa26b2547 100644
Binary files a/shijian1807/__pycache__/models.cpython-36.pyc and b/shijian1807/__pycache__/models.cpython-36.pyc differ
diff --git a/shijian1807/__pycache__/urls.cpython-36.pyc b/shijian1807/__pycache__/urls.cpython-36.pyc
index 6d420801e9e10adfdbd42c5fe4b36f087b676a7f..5de73ee46db01e64fa33e2f5d3b2506313d0333e 100644
Binary files a/shijian1807/__pycache__/urls.cpython-36.pyc and b/shijian1807/__pycache__/urls.cpython-36.pyc differ
diff --git a/shijian1807/__pycache__/views.cpython-36.pyc b/shijian1807/__pycache__/views.cpython-36.pyc
index 4983c3effa5b950f5d38e51957eeeec855c9c8b1..71d60ec874e3a5ddef3f8698080991ac872c8aae 100644
Binary files a/shijian1807/__pycache__/views.cpython-36.pyc and b/shijian1807/__pycache__/views.cpython-36.pyc differ
diff --git a/shijian1807/migrations/__pycache__/__init__.cpython-36.pyc b/shijian1807/migrations/__pycache__/__init__.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..48f1207b37fa3e42668b393a2eeca81e3a4e3922
Binary files /dev/null and b/shijian1807/migrations/__pycache__/__init__.cpython-36.pyc differ
diff --git a/slq/__pycache__/__init__.cpython-36.pyc b/slq/__pycache__/__init__.cpython-36.pyc
index 9bd3603126e9dba0988ef36f7875abad8321db1d..83431dc99a5e3d43e582c05ceb3c5c118a8388f5 100644
Binary files a/slq/__pycache__/__init__.cpython-36.pyc and b/slq/__pycache__/__init__.cpython-36.pyc differ
diff --git a/slq/__pycache__/admin.cpython-36.pyc b/slq/__pycache__/admin.cpython-36.pyc
index 9e2afa9a9c279173e756263fe4051998414a6bef..0301639e127e97fcdbd051d2a66c69bef0469522 100644
Binary files a/slq/__pycache__/admin.cpython-36.pyc and b/slq/__pycache__/admin.cpython-36.pyc differ
diff --git a/slq/__pycache__/models.cpython-36.pyc b/slq/__pycache__/models.cpython-36.pyc
index a4449a8cc75b05f9855c56d8fb0a7192da88c16a..f4acd6d3414e721809f6d7876a117dcbd5bce99d 100644
Binary files a/slq/__pycache__/models.cpython-36.pyc and b/slq/__pycache__/models.cpython-36.pyc differ
diff --git a/slq/__pycache__/urls.cpython-36.pyc b/slq/__pycache__/urls.cpython-36.pyc
index 193ec37e0072c43f7ce3e1ceb3c0ed91783bf7b2..148ef71a71734c00ed96a684728632c1dac48d47 100644
Binary files a/slq/__pycache__/urls.cpython-36.pyc and b/slq/__pycache__/urls.cpython-36.pyc differ
diff --git a/slq/__pycache__/views.cpython-36.pyc b/slq/__pycache__/views.cpython-36.pyc
index 59da05c9dc8b51e72bcf6d303493976c1131cfce..46ddac48f42a6065758d288a96ffaf59b52d1f2a 100644
Binary files a/slq/__pycache__/views.cpython-36.pyc and b/slq/__pycache__/views.cpython-36.pyc differ
diff --git a/slq/migrations/__pycache__/__init__.cpython-36.pyc b/slq/migrations/__pycache__/__init__.cpython-36.pyc
index 37a2f1b7ded522091e3a8edf5f8442a27d44f5a1..a1e188a855176221c25d04dfd087812c31a7c518 100644
Binary files a/slq/migrations/__pycache__/__init__.cpython-36.pyc and b/slq/migrations/__pycache__/__init__.cpython-36.pyc differ
diff --git a/sxh/__pycache__/__init__.cpython-36.pyc b/sxh/__pycache__/__init__.cpython-36.pyc
index e9f86a41b000b69185dd2b7bc72db51f73f2d33c..7f5e3727cdf3f88a46f755df925194a3d7e23bb0 100644
Binary files a/sxh/__pycache__/__init__.cpython-36.pyc and b/sxh/__pycache__/__init__.cpython-36.pyc differ
diff --git a/sxh/__pycache__/admin.cpython-36.pyc b/sxh/__pycache__/admin.cpython-36.pyc
index e0b6f0e8ed68d0861f6a73194fe5a1dbb9f2ef1f..bd1a2d06f63271c9f02d344a4fa89621692f6e4c 100644
Binary files a/sxh/__pycache__/admin.cpython-36.pyc and b/sxh/__pycache__/admin.cpython-36.pyc differ
diff --git a/sxh/__pycache__/models.cpython-36.pyc b/sxh/__pycache__/models.cpython-36.pyc
index 7995a95ca586cb440ab7ae79f99162e0c202634e..03f6230e5b97ca0dffcdeaeadee154830c06057a 100644
Binary files a/sxh/__pycache__/models.cpython-36.pyc and b/sxh/__pycache__/models.cpython-36.pyc differ
diff --git a/sxh/__pycache__/urls.cpython-36.pyc b/sxh/__pycache__/urls.cpython-36.pyc
index efd40234d3722a2638fe9f1a5525e78b41720f34..9b3dc6855e3d9f194d240f42439133c91dbdd37c 100644
Binary files a/sxh/__pycache__/urls.cpython-36.pyc and b/sxh/__pycache__/urls.cpython-36.pyc differ
diff --git a/sxh/__pycache__/views.cpython-36.pyc b/sxh/__pycache__/views.cpython-36.pyc
index 23c8f9a1f53d1d5b4fd69150c7b485b7fc0837fa..c64cdc05efc6af9de3aefd5d9cc15e01e007dac9 100644
Binary files a/sxh/__pycache__/views.cpython-36.pyc and b/sxh/__pycache__/views.cpython-36.pyc differ
diff --git a/sxh/migrations/__pycache__/__init__.cpython-36.pyc b/sxh/migrations/__pycache__/__init__.cpython-36.pyc
index ed9b97152ed97e375a328af1cbaeeeadb34356f5..7c93dcb0d6330623b5d4091a757d1111bf95aad1 100644
Binary files a/sxh/migrations/__pycache__/__init__.cpython-36.pyc and b/sxh/migrations/__pycache__/__init__.cpython-36.pyc differ
diff --git a/templates/caojupeng.html b/templates/caojupeng.html
new file mode 100644
index 0000000000000000000000000000000000000000..f157f7cc62e47f2b2228856f98158868baa39e22
--- /dev/null
+++ b/templates/caojupeng.html
@@ -0,0 +1,10 @@
+
+
+
+
+ 曹菊鹏
+
+
+
曹菊鹏aa
+
+
\ No newline at end of file
diff --git a/templates/index.html b/templates/index.html
index f32af00d94f6aac04eede718454dd9e6cec34db2..10b44a1c9dd5de3aea33940665ce9446b164e94a 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -57,12 +57,12 @@
-<<<<<<< HEAD
+